Fix gawkapi node_to_awk_value to check scalar type correctly.

2 files changed, 7 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 692f2a8d..a016ca91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-06-14         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* gawkapi.c (node_to_awk_value): When caller requests AWK_SCALAR
+	or AWK_UNDEFINED, we need to call fixtype before we check the type.
+
 2016-06-13         Andrew J. Schorr     <aschorr@telemetry-investments.com>
 
 	* awkgram.y: Eliminate STRCUR tests. Must use STRING to test whether
diff --git a/gawkapi.c b/gawkapi.c
index b961f797..3d9f61a9 100644
--- a/gawkapi.c
+++ b/gawkapi.c
@@ -445,6 +445,7 @@ node_to_awk_value(NODE *node, awk_value_t *val, awk_valtype_t wanted)
 			break;
 
 		case AWK_SCALAR:
+			fixtype(node);
 			if ((node->flags & NUMBER) != 0) {
 				val->val_type = AWK_NUMBER;
 			} else if ((node->flags & STRING) != 0) {
@@ -456,6 +457,7 @@ node_to_awk_value(NODE *node, awk_value_t *val, awk_valtype_t wanted)
 
 		case AWK_UNDEFINED:
 			/* return true and actual type for request of undefined */
+			fixtype(node);
 			if (node == Nnull_string) {
 				val->val_type = AWK_UNDEFINED;
 				ret = awk_true;