Commite9928b8

committed

Prevent misoptimization of register variable, also for consitency added

jsqIterateDestroy.

1 parent5ec2b22 commite9928b8Copy full SHA for e9928b8

File tree

+14

-3

lines changed

+14

-3

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,7 @@ extern int32jsqGetIsType(JsQueryItem *v);`
`123`	`123`	`externcharjsqGetString(JsQueryItemv,int32*len);`
`124`	`124`	`externvoidjsqIterateInit(JsQueryItem*v);`
`125`	`125`	`externbooljsqIterateArray(JsQueryItemv,JsQueryIteme);`
	`126`	`+externvoidjsqIterateDestroy(JsQueryItem*v);`
`126`	`127`
`127`	`128`	`voidalignStringInfoInt(StringInfobuf);`
`128`	`129`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,8 @@ executeArrayOp(JsQueryItem jsq, int32 op, JsonbValue jb)`
`273`	`273`	`int32r=0;/* keep static analyzer quiet */`
`274`	`274`	`JsonbIterator*it;`
`275`	`275`	`JsonbValuev;`
`276`		`-JsQueryItemelem;`
	`276`	`+JsQueryItemelem;`
	`277`	`+boolres;`
`277`	`278`
`278`	`279`	`if (JsonbType(jb)!=jbvArray)`
`279`	`280`	`return false;`
`@@ -284,7 +285,7 @@ executeArrayOp(JsQueryItem jsq, int32 op, JsonbValue jb)`
`284`	`285`	`{`
`285`	`286`	`while(jsqIterateArray(jsq,&elem))`
`286`	`287`	`{`
`287`		`-boolres= false;`
	`288`	`+res= false;`
`288`	`289`
`289`	`290`	`it=JsonbIteratorInit(jb->val.binary.data);`
`290`	`291`
`@@ -306,7 +307,7 @@ executeArrayOp(JsQueryItem jsq, int32 op, JsonbValue jb)`
`306`	`307`	`{`
`307`	`308`	`if (r==WJB_ELEM)`
`308`	`309`	`{`
`309`		`-boolres= false;`
	`310`	`+res= false;`
`310`	`311`
`311`	`312`	`jsqIterateInit(jsq);`
`312`	`313`	`while(jsqIterateArray(jsq,&elem))`
`@@ -319,6 +320,7 @@ executeArrayOp(JsQueryItem jsq, int32 op, JsonbValue jb)`
`319`	`320`	`break;`
`320`	`321`	`}`
`321`	`322`	`}`
	`323`	`+jsqIterateDestroy(jsq);`
`322`	`324`
`323`	`325`	`if (op==jqiContained&&res== false)`
`324`	`326`	`return false;`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -252,3 +252,11 @@ jsqIterateArray(JsQueryItem v, JsQueryItem e)`
`252`	`252`	`}`
`253`	`253`	`}`
`254`	`254`
	`255`	`+void`
	`256`	`+jsqIterateDestroy(JsQueryItem*v)`
	`257`	`+{`
	`258`	`+Assert(v->type==jqiArray);`
	`259`	`+Assert(v->array.current <=v->array.current);`
	`260`	`+v->array.current++;`
	`261`	`+}`
	`262`	`+`

Comments

(0)