Fix memory leak for { $foo: bar }

{ BINDING: ExpD } wasn't freeing BINDING. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=60865
jqlang · Jul 28, 2023 · 17889a1 · 17889a1
1 parent 5b9d075
commit 17889a1
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/src/parser.c b/src/parser.c
diff --git a/src/parser.y b/src/parser.y
@@ -980,6 +980,7 @@ IDENT ':' ExpD {
 | BINDING ':' ExpD {
   $$ = gen_dictpair(gen_location(@$, locations, gen_op_unbound(LOADV, jv_string_value($1))),
                     $3);
+  jv_free($1);
   }
 | BINDING {
   $$ = gen_dictpair(gen_const($1),

diff --git a/tests/jq.test b/tests/jq.test
@@ -1849,12 +1849,16 @@ reduce .[] as $then (4 as $else | $else; . as $elif | . + $then * $elif)
 [10,19,27,34]
 
 
-# { $__loc__ } works
+# Object construction
 
 { a, $__loc__, c }
 {"a":[1,2,3],"b":"foo","c":{"hi":"hey"}}
 {"a":[1,2,3],"__loc__":{"file":"<top-level>","line":1},"c":{"hi":"hey"}}
 
+1 as $x | "2" as $y | "3" as $z | { $x, as, $y: 4, ($z): 5, if: 6, foo: 7 }
+{"as":8}
+{"x":1,"as":8,"2":4,"3":5,"if":6,"foo":7}
+
 
 # nan is parsed as a valid NaN value from JSON