csonpath 0.15.0__tar.gz → 0.16.0__tar.gz

{csonpath-0.15.0 → csonpath-0.16.0}/Makefile

@@ -5,7 +5,7 @@ YYJSON_LDFLAGS=$(shell pkg-config --libs yyjson)
 
 include config.mk
 
-all: test-json-c-get-a test-json-update test-json-filter test-json-subpath test-json-c-array-root test-json-filter-and-missing-key test-json-get-array-big-index test-json-union
+all: test-json-c-get-a test-json-update test-json-filter test-json-subpath test-json-c-array-root test-json-filter-and-missing-key test-json-get-array-big-index test-json-union test-json-audit-bugs test-json-crash-vectors
 
 YYJSON_TESTS=test-yyjson
 
@@ -43,10 +43,16 @@ test-json-get-array-big-index: tests/json-c/get-array-big-index.c csonpath_json-
 test-json-union: tests/json-c/union.c csonpath_json-c.h csonpath.h csonpath_do.h
 	$(CC) tests/json-c/union.c $(EXTRA_FILES) $(JSON_C_CFLAGS) $(CFLAGS) -Wno-format -I./ -o test-json-union  $(JSON_C_LDFLAGS) $(LDFLAGS)
 
+test-json-audit-bugs: tests/json-c/audit-bugs.c csonpath_json-c.h csonpath.h csonpath_do.h
+	$(CC) tests/json-c/audit-bugs.c $(EXTRA_FILES) $(JSON_C_CFLAGS) $(CFLAGS) -Wno-format -I./ -o test-json-audit-bugs  $(JSON_C_LDFLAGS) $(LDFLAGS)
+
+test-json-crash-vectors: tests/json-c/crash-vectors.c csonpath_json-c.h csonpath.h csonpath_do.h
+	$(CC) tests/json-c/crash-vectors.c $(EXTRA_FILES) $(JSON_C_CFLAGS) $(CFLAGS) -Wno-format -I./ -o test-json-crash-vectors  $(JSON_C_LDFLAGS) $(LDFLAGS)
+
 test-yyjson: tests/yyjson/test-yyjson.c csonpath_yyjson.h csonpath.h csonpath_do.h
 	$(CC) tests/yyjson/test-yyjson.c $(EXTRA_FILES) $(YYJSON_CFLAGS) $(CFLAGS) -Wno-format -I./ -o test-yyjson $(YYJSON_LDFLAGS) $(LDFLAGS)
 
- tests-c: test-json-c-get-a test-json-update test-json-filter test-json-subpath test-json-c-array-root test-json-filter-and-missing-key test-json-get-array-big-index test-json-union test-yyjson
+ tests-c: test-json-c-get-a test-json-update test-json-filter test-json-subpath test-json-c-array-root test-json-filter-and-missing-key test-json-get-array-big-index test-json-union test-json-audit-bugs test-json-crash-vectors test-yyjson
 	./test-json-c-get-a
 	./test-json-update
 	./test-json-filter
@@ -55,6 +61,8 @@ test-yyjson: tests/yyjson/test-yyjson.c csonpath_yyjson.h csonpath.h csonpath_do
 	./test-json-filter-and-missing-key
 	./test-json-get-array-big-index
 	./test-json-union
+	./test-json-audit-bugs
+	./test-json-crash-vectors
 	./test-yyjson
 
 pip-dev:
@@ -66,5 +74,5 @@ tests-py: pip-dev
 tests: tests-py tests-c
 
 clean:
-	rm -rvf test-json-c-get-a test-json-update test-json-filter test-json-subpath test-json-c-array-root test-json-filter-and-missing-key test-json-get-array-big-index test-json-union test-yyjson
+	rm -rvf test-json-c-get-a test-json-update test-json-filter test-json-subpath test-json-c-array-root test-json-filter-and-missing-key test-json-get-array-big-index test-json-union test-json-audit-bugs test-json-crash-vectors test-yyjson
 

{csonpath-0.15.0/csonpath.egg-info → csonpath-0.16.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csonpath
-Version: 0.15.0
+Version: 0.16.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: dev
@@ -30,7 +30,8 @@ Unlike many JSONPath libraries, csonpath is **backend-agnostic**: it can work wi
 | Array index | `$.array[0]` | Access by zero-based index |
 | Wildcard `[*]` | `$.array[*].field` | Iterate all array elements |
 | Recursive descent `..` | `$..name` | Search recursively for a key |
-| Union `\|` / `,` | `$.a \| $.b` or `$['a','b']` | Match multiple paths at once |
+| Union `,` (inside brackets) | `$['a','b']`, `$.array[0,1]`, `$.items[?n==1, ?n==2]` | Match all listed selectors at once |
+| OR fallback `\|` | `$.a \| $.b` | Try the left path first; fall back to the right one if it does not match. Only the first successful path is used. |
 | Filters | `$.items[?price > 10]` | Filter array elements |
 | Regex filters | `$.items[?name =~ "foo"]` | POSIX regex-based filtering |
 | Multiple filters (`&`) | `$.items[?a=1 & b=2]` | Combine conditions |

{csonpath-0.15.0 → csonpath-0.16.0}/README.md

@@ -21,7 +21,8 @@ Unlike many JSONPath libraries, csonpath is **backend-agnostic**: it can work wi
 | Array index | `$.array[0]` | Access by zero-based index |
 | Wildcard `[*]` | `$.array[*].field` | Iterate all array elements |
 | Recursive descent `..` | `$..name` | Search recursively for a key |
-| Union `\|` / `,` | `$.a \| $.b` or `$['a','b']` | Match multiple paths at once |
+| Union `,` (inside brackets) | `$['a','b']`, `$.array[0,1]`, `$.items[?n==1, ?n==2]` | Match all listed selectors at once |
+| OR fallback `\|` | `$.a \| $.b` | Try the left path first; fall back to the right one if it does not match. Only the first successful path is used. |
 | Filters | `$.items[?price > 10]` | Filter array elements |
 | Regex filters | `$.items[?name =~ "foo"]` | POSIX regex-based filtering |
 | Multiple filters (`&`) | `$.items[?a=1 & b=2]` | Combine conditions |

{csonpath-0.15.0 → csonpath-0.16.0}/configure

@@ -21,12 +21,17 @@ for arg in $@; do
 	CFLAGS="${CFLAGS} -DCSONPATH_PCRE2_POSIX $(pkg-config --cflags libpcre2-posix)"
 	LDFLAGS="${LDFLAGS} $(pkg-config --libs libpcre2-posix)"
     fi
+    if [ "--asan" = $arg ]; then
+	CFLAGS="${CFLAGS} -fsanitize=address -fno-omit-frame-pointer"
+	LDFLAGS="${LDFLAGS} -fsanitize=address"
+    fi
     if [ "--help" = $arg ]; then
 	echo "help"
 	echo "	--tiny-regex"
 	echo "	--pcre2-regex"
 	echo "	--pcre2-posix"
 	echo "	--no-regex"
+	echo "	--asan"
     fi
 done
 

{csonpath-0.15.0 → csonpath-0.16.0/csonpath.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csonpath
-Version: 0.15.0
+Version: 0.16.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: dev
@@ -30,7 +30,8 @@ Unlike many JSONPath libraries, csonpath is **backend-agnostic**: it can work wi
 | Array index | `$.array[0]` | Access by zero-based index |
 | Wildcard `[*]` | `$.array[*].field` | Iterate all array elements |
 | Recursive descent `..` | `$..name` | Search recursively for a key |
-| Union `\|` / `,` | `$.a \| $.b` or `$['a','b']` | Match multiple paths at once |
+| Union `,` (inside brackets) | `$['a','b']`, `$.array[0,1]`, `$.items[?n==1, ?n==2]` | Match all listed selectors at once |
+| OR fallback `\|` | `$.a \| $.b` | Try the left path first; fall back to the right one if it does not match. Only the first successful path is used. |
 | Filters | `$.items[?price > 10]` | Filter array elements |
 | Regex filters | `$.items[?name =~ "foo"]` | POSIX regex-based filtering |
 | Multiple filters (`&`) | `$.items[?a=1 & b=2]` | Combine conditions |

{csonpath-0.15.0 → csonpath-0.16.0}/csonpath.h

@@ -5,7 +5,7 @@
   !defined(CSONPATH_EQUAL_STR) || !defined(CSONPATH_CALL_CALLBACK) || \
   !defined(CSONPATH_FOREACH_EXT) || !defined(CSONPATH_APPEND_AT) || \
   !defined(CSONPATH_REMOVE_CHILD) || !defined(CSONPATH_NEED_FOREACH_REDO) || \
-  !defined(CSONPATH_ARRAY_APPEND_INCREF) || !defined(CSONPATH_REMOVE)
+  !defined(CSONPATH_ARRAY_APPEND) || !defined(CSONPATH_REMOVE)
 # error "some definitions are missing"
 #endif
 
@@ -48,10 +48,6 @@ typedef regex_t csonpath_reg_t;
 #define CSONPATH_FIND_ALL_RET_INIT CSONPATH_NEW_ARRAY
 #endif
 
-#ifndef CSONPATH_DECREF
-#define CSONPATH_DECREF(obj)
-#endif
-
 #ifndef CSONPATH_FORMAT_EXCEPTION
 #define CSONPATH_FORMAT_EXCEPTION(args...) fprintf(stderr, args)
 #endif
@@ -231,6 +227,14 @@ struct csonpath_child_info {
 #define CSONPATH_ERROR_MAX_SIZE 1024
 #define CSONPATH_TMP_BUF_SIZE 256
 
+#define CSONPATH_FILTER_PUSH(dst, cnt, c, walk_ptr) do {		\
+	if ((cnt + 1) >= CSONPATH_TMP_BUF_SIZE) {			\
+	    CSONPATH_COMPILE_ERR(tmp, walk_ptr - orig, "%s", "filter key too long"); \
+	    goto error;							\
+	}								\
+	(dst)[(cnt)++] = (c);						\
+    } while (0)
+
 /* I'm assuming error message won't be longer than 125 */
 #define CSONPATH_COMPILE_ERR(tmp, idx, args...) do {			\
 	int ltmp  = strlen(tmp), lidx, oidx = idx;			\
@@ -455,7 +459,15 @@ static void push_filter_getter(struct csonpath *cjp, int *inst_idx, int nb_gette
     csonpath_push_char(cjp, filter_getter[i], inst_idx);
   }
   *filter_end = (nb_getter_inst - 1);
+}
 
+static _Bool consonpath_check_tmp_walker(const char tmp_walk[static 1], int cnt_brackets)
+{
+    if (!*tmp_walk)
+	return 0;
+    if (cnt_brackets)
+	return 1;
+    return (*tmp_walk != ']');
 }
 
 static int csonpath_compile_do(struct csonpath *cjp, const char orig[static 1],
@@ -492,8 +504,9 @@ root_again:
 	  do_array:
 	    if (!in_union) {
 		int cnt_brackets = 0;
-		for (const char *tmp_walk = walker + 1;
-		     *tmp_walk && *tmp_walk != ']' && !cnt_brackets;
+		const char *tmp_walk;
+		for (tmp_walk = walker + 1;
+		     consonpath_check_tmp_walker(tmp_walk, cnt_brackets);
 		     ++tmp_walk) {
 		    if (!cnt_brackets && *tmp_walk == ',') {
 			csonpath_push_char(cjp, CSONPATH_INST_GET_UNION, inst_idx);
@@ -504,10 +517,16 @@ root_again:
 			++cnt_brackets;
 		    if (cnt_brackets && *tmp_walk == ']')
 			--cnt_brackets;
-		    if (*tmp_walk == '"')
+		    if (*tmp_walk == '"') {
 			for (++tmp_walk; *tmp_walk != '"' && *tmp_walk; ++tmp_walk);
-		    if (*tmp_walk == '\'')
-			for (++tmp_walk; *tmp_walk !=  '\'' && *tmp_walk; ++tmp_walk);
+		    }
+		    else if (*tmp_walk == '\'') {
+			for (++tmp_walk; *tmp_walk != '\'' && *tmp_walk; ++tmp_walk);
+		    }
+		    if (!*tmp_walk) break;
+		}
+		if (!tmp_walk[0]) {
+			CSONPATH_COMPILE_ERR(tmp, walker - orig, "unclose union");
 		}
 	    }
 	    ++walker;
@@ -547,7 +566,7 @@ root_again:
 		}
 	      filter_again_root:
 		inst = CSONPATH_INST_GET_OBJ;
-		filter_getter[nb_getter_inst++] = CSONPATH_INST_GET_OBJ;
+		CSONPATH_FILTER_PUSH(filter_getter, nb_getter_inst, CSONPATH_INST_GET_OBJ, walker);
 		++walker;
 
 		/* skipp blank */
@@ -585,12 +604,12 @@ root_again:
 		    }
 		    ++walker;
 		    for (next = walker; *next != getter_end; ++next)
-			filter_getter[nb_getter_inst++] = *next;
-		    filter_getter[nb_getter_inst++] = 0;
+			CSONPATH_FILTER_PUSH(filter_getter, nb_getter_inst, *next, next);
+		    CSONPATH_FILTER_PUSH(filter_getter, nb_getter_inst, 0, next);
 		} else {
 		    for (next = walker; csonpath_is_dot_operand(*next); ++next)
-			filter_getter[nb_getter_inst++] = *next;
-		    filter_getter[nb_getter_inst++] = 0;
+			CSONPATH_FILTER_PUSH(filter_getter, nb_getter_inst, *next, next);
+		    CSONPATH_FILTER_PUSH(filter_getter, nb_getter_inst, 0, next);
 		}
 		if (!*next) {
 		    CSONPATH_COMPILE_ERR(tmp, next - orig,
@@ -606,11 +625,11 @@ root_again:
 		}
 		if (to_check == '.') {
 		    walker = next + 1;
-		    filter_getter[nb_getter_inst++] = CSONPATH_INST_GET_OBJ;
+		    CSONPATH_FILTER_PUSH(filter_getter, nb_getter_inst, CSONPATH_INST_GET_OBJ, walker);
 		    goto filter_again;
 		} else if (to_check == '[') {
 		    walker = next + 1;
-		    filter_getter[nb_getter_inst++] = CSONPATH_INST_GET_OBJ;
+		    CSONPATH_FILTER_PUSH(filter_getter, nb_getter_inst, CSONPATH_INST_GET_OBJ, walker);
 		    getter_end = *walker;
 		    goto filter_again;
 		}
@@ -896,13 +915,17 @@ root_again:
 		++walker;
 		next = walker;
 		csonpath_push_char(cjp, inst, inst_idx);
-		while (*next != end) {
-		    /* \" should be ignored */
+		while (*next && *next != end) {
+		    /* TODO: \" should be ignored */
 		    csonpath_push_char(cjp, *next, inst_idx);
 		    ++next;
 		    while (*next == '\\')
 			++next;
 		}
+		if (!*next) {
+		    CSONPATH_COMPILE_ERR(tmp, walker - orig,
+					 "unclosed string in bracket");
+		}
 		++next; // skipp end
 		csonpath_push_char(cjp, 0, inst_idx);
 		if (in_union && *next == ',') {
@@ -1103,7 +1126,7 @@ need_reloop_in = 0;
 
 #define CSONPATH_DO_FIND_ALL_OUT if (end_sentinel) *end_sentinel = walker;  return CSONPATH_NULL
 
-#define CSONPATH_DO_EXTRA_DECLATION , const char **end_sentinel
+#define CSONPATH_DO_EXTRA_DECLARATION , const char **end_sentinel
 #define CSONPATH_DO_EXTRA_ARGS_IN , NULL
 #define CSONPATH_DO_EXTRA_ARGS_NEESTED , end_sentinel
 
@@ -1122,7 +1145,7 @@ need_reloop_in = 0;
 
 #define CSONPATH_DO_FUNC_NAME find_all
 #define CSONPATH_DO_RET_TYPE CSONPATH_FIND_ALL_RET
-#define CSONPATH_DO_RETURN ({CSONPATH_ARRAY_APPEND_INCREF(ret_ar, tmp); return ret_ar;})
+#define CSONPATH_DO_RETURN ({CSONPATH_ARRAY_APPEND(ret_ar, tmp); return ret_ar;})
 
 #define CSONPATH_DO_FIND_ALL						\
     if (tret) ++nb_res;							\
@@ -1136,7 +1159,7 @@ need_reloop_in = 0;
     return ret_ar;
 
 #define CSONPATH_DO_EXTRA_ARGS_IN , ret_ar
-#define CSONPATH_DO_EXTRA_DECLATION , CSONPATH_FIND_ALL_RET ret_ar
+#define CSONPATH_DO_EXTRA_DECLARATION , CSONPATH_FIND_ALL_RET ret_ar
 
 #include "csonpath_do.h"
 
@@ -1158,10 +1181,12 @@ need_reloop_in = 0;
 
 #define CSONPATH_DO_RET_TYPE int
 #define CSONPATH_DO_RETURN						\
-	({if (ctx == in_ctx && need_reloop &&				\
-	      CSONPATH_NEED_FOREACH_REDO(ctx))				\
-			*need_reloop = 1;				\
-		CSONPATH_REMOVE_CHILD(ctx, child_info); return 1;})
+    ({if (ctx == in_ctx && need_reloop &&				\
+	  CSONPATH_NEED_FOREACH_REDO(ctx))				\
+	    *need_reloop = 1;						\
+	if (child_info.type == CSONPATH_NONE)				\
+	    return 0;							\
+	CSONPATH_REMOVE_CHILD(ctx, child_info); return 1;})
 
 #define CSONPATH_PRE_GET_OBJ(val)		\
     const char *to_del = val;
@@ -1200,7 +1225,7 @@ need_reloop_in = 0;
 	    nb_res += tret;						\
 	})
 
-#define CSONPATH_DO_EXTRA_DECLATION , struct csonpath_child_info child_info, int *need_reloop
+#define CSONPATH_DO_EXTRA_DECLARATION , struct csonpath_child_info child_info, int *need_reloop
 
 #define CSONPATH_DO_EXTRA_ARGS_IN , (struct csonpath_child_info) {.type = CSONPATH_NONE}, NULL
 
@@ -1260,9 +1285,9 @@ again:
     if (child_info->type != CSONPATH_NONE) {				\
 	if (need_reloop) *need_reloop = 1;				\
 	if (child_info->type == CSONPATH_INTEGER)			\
-	    return CSONPATH_APPEND_AT(ctx, child_info->idx, to_update); \
+	    return CSONPATH_APPEND_AT(ctx, child_info->idx, to_update, 1); \
 	else								\
-	    return CSONPATH_APPEND_AT(ctx, child_info->key, to_update); \
+	    return CSONPATH_APPEND_AT(ctx, child_info->key, to_update, 1); \
 	return 1;							\
     }									\
     return 0;
@@ -1273,7 +1298,7 @@ again:
 		csonpath_child_info_set(&(struct csonpath_child_info ){}, tmp, (intptr_t)key_idx), &need_reloop_in
 #define CSONPATH_DO_EXTRA_ARGS , CSONPATH_JSON to_update
 #define CSONPATH_DO_EXTRA_ARGS_IN , to_update, &(struct csonpath_child_info ){}, NULL
-#define CSONPATH_DO_EXTRA_DECLATION CSONPATH_DO_EXTRA_ARGS, struct csonpath_child_info *child_info, int *need_reloop
+#define CSONPATH_DO_EXTRA_DECLARATION CSONPATH_DO_EXTRA_ARGS, struct csonpath_child_info *child_info, int *need_reloop
 #define CSONPATH_DO_FIND_ALL nb_res += tret;
 #define CSONPATH_DO_FILTER_FIND CSONPATH_GOTO_ON_RELOOP(filter_again)
 
@@ -1318,7 +1343,7 @@ static int csonpath_sync_root_array(CSONPATH_JSON parent, CSONPATH_JSON to_updat
     (void) idx;
     CSONPATH_ARRAY_CLEAR(parent);
     CSONPATH_FOREACH_ARRAY(to_update, child, idx) {
-	if (CSONPATH_APPEND_AT(parent, idx, child) < 0)
+	if (CSONPATH_APPEND_AT(parent, idx, child, 1) < 0)
 	    return -1;
     }
     return 1;
@@ -1332,7 +1357,7 @@ static int csonpath_sync_root_obj(CSONPATH_JSON parent, CSONPATH_JSON to_update)
     (void )key;
     CSONPATH_OBJ_CLEAR(parent);
     CSONPATH_FOREACH_OBJ(to_update, child, key) {
-	if (CSONPATH_APPEND_AT(parent, key, child) < 0)
+	if (CSONPATH_APPEND_AT(parent, key, child, 1) < 0)
 	    return -1;
     }
     return 1;
@@ -1342,14 +1367,14 @@ static int csonpath_sync_root_obj(CSONPATH_JSON parent, CSONPATH_JSON to_update)
 #define CSONPATH_UPDATE_CHECK_EXIST(mk_cnt)				\
     if (tmp == CSONPATH_NULL) {						\
 	int append_ret = 0;						\
+	if (child_info->type == CSONPATH_NONE)				\
+	    CSONPATH_GETTER_ERR("CSONPATH_NONE is nope\n");		\
 	tmp = mk_cnt();							\
 	if (child_info->type == CSONPATH_INTEGER)			\
-	    append_ret = CSONPATH_APPEND_AT(ctx, child_info->idx, tmp);	\
+	    append_ret = CSONPATH_APPEND_AT(ctx, child_info->idx, tmp, 1); \
 	else if (child_info->type == CSONPATH_STR)			\
-	    append_ret = CSONPATH_APPEND_AT(ctx, child_info->key, tmp);	\
-	else								\
-	    CSONPATH_GETTER_ERR("CSONPATH_NONE is nope\n");		\
-	CSONPATH_DECREF(tmp);						\
+	    append_ret = CSONPATH_APPEND_AT(ctx, child_info->key, tmp, 1); \
+	CSONPATH_REMOVE(tmp);						\
 	if (append_ret < 0) return append_ret;				\
 	ctx = tmp;							\
     }
@@ -1370,7 +1395,6 @@ static int csonpath_sync_root_obj(CSONPATH_JSON parent, CSONPATH_JSON to_update)
     csonpath_child_info_set(child_info, tmp, this_idx);
 
 
-
 #include "csonpath_do.h"
 
 /* callback */
@@ -1381,18 +1405,26 @@ static int csonpath_sync_root_obj(CSONPATH_JSON parent, CSONPATH_JSON to_update)
 #define CSONPATH_DO_RET_TYPE int
 #define CSONPATH_DO_FUNC_NAME callback
 #define CSONPATH_DO_RETURN  do {					\
-    CSONPATH_CALL_CALLBACK(callback, ctx, child_info, tmp, udata); return 1;} \
-  while (0)
+	if (CSONPATH_CALL_CALLBACK(callback, ctx, child_info, tmp, udata) < 0) \
+	    return -1;							\
+	return 1;}							\
+    while (0)
+
+#define CSONPATH_DO_PRE_OPERATION		\
+  if (callback == NULL) {			\
+    CSONPATH_GETTER_ERR("callback is NULL\n");	\
+    return -1;					\
+  }
 
 #define CSONPATH_DO_EXTRA_ARGS_FIND_ALL , callback, udata, child_info
 #define CSONPATH_DO_EXTRA_ARGS_NEESTED , callback, udata,		\
     csonpath_child_info_set(child_info, tmp, (intptr_t)key_idx)
 #define CSONPATH_DO_EXTRA_ARGS , CSONPATH_CALLBACK callback, CSONPATH_CALLBACK_DATA udata
 #define CSONPATH_DO_EXTRA_ARGS_IN , callback, udata, &(struct csonpath_child_info ){}
-#define CSONPATH_DO_EXTRA_DECLATION CSONPATH_DO_EXTRA_ARGS, struct csonpath_child_info *child_info
+#define CSONPATH_DO_EXTRA_DECLARATION CSONPATH_DO_EXTRA_ARGS, struct csonpath_child_info *child_info
 
-#define CSONPATH_DO_FIND_ALL nb_res += tret;
-#define CSONPATH_DO_FILTER_FIND nb_res += tret;
+#define CSONPATH_DO_FIND_ALL do { if (tret < 0) return tret; nb_res += tret; } while (0)
+#define CSONPATH_DO_FILTER_FIND do { if (tret < 0) return tret; nb_res += tret; } while (0)
 
 #define CSONPATH_DO_FIND_ALL_OUT return nb_res;
 
@@ -1408,24 +1440,31 @@ static int csonpath_sync_root_obj(CSONPATH_JSON parent, CSONPATH_JSON to_update)
 #define CSONPATH_DO_DECLARATION			\
 	int nb_res = 0;
 
+#define CSONPATH_DO_PRE_OPERATION		\
+  if (callback == NULL) {			\
+    CSONPATH_GETTER_ERR("callback is NULL\n");	\
+    return -1;					\
+  }
+
 #define CSONPATH_DO_RET_TYPE int
 #define CSONPATH_DO_FUNC_NAME update_or_create_callback
 #define CSONPATH_DO_RETURN						\
-	if (tmp == value) {						\
-		*need_reloop = 1;					\
-	}								\
-	CSONPATH_CALL_CALLBACK(callback, ctx, child_info, tmp, udata);	\
-	return 1;
+    if (need_reloop && tmp == value) {					\
+	*need_reloop = 1;						\
+    }									\
+    if (CSONPATH_CALL_CALLBACK(callback, ctx, child_info, tmp, udata) < 0) \
+	return -1;							\
+    return 1;
 
 #define CSONPATH_DO_EXTRA_ARGS_FIND_ALL , callback, udata, NULL, need_reloop
-#define CSONPATH_DO_EXTRA_ARGS_NEESTED , callback, udata,	\
+#define CSONPATH_DO_EXTRA_ARGS_NEESTED , callback, udata,		\
 	csonpath_child_info_set(&(struct csonpath_child_info ){}, tmp, (intptr_t)key_idx), \
 	&need_reloop_in
 #define CSONPATH_DO_EXTRA_ARGS , CSONPATH_CALLBACK callback, CSONPATH_CALLBACK_DATA udata
 #define CSONPATH_DO_EXTRA_ARGS_IN , callback, udata, &(struct csonpath_child_info ){}, NULL
-#define CSONPATH_DO_EXTRA_DECLATION CSONPATH_DO_EXTRA_ARGS, struct csonpath_child_info *child_info, int *need_reloop
-#define CSONPATH_DO_FIND_ALL nb_res += tret;
-#define CSONPATH_DO_FILTER_FIND CSONPATH_GOTO_ON_RELOOP(filter_again)
+#define CSONPATH_DO_EXTRA_DECLARATION CSONPATH_DO_EXTRA_ARGS, struct csonpath_child_info *child_info, int *need_reloop
+#define CSONPATH_DO_FIND_ALL do { if (tret < 0) return tret; nb_res += tret; } while (0)
+#define CSONPATH_DO_FILTER_FIND do { if (tret < 0) return tret; CSONPATH_GOTO_ON_RELOOP(filter_again); } while (0)
 
 #define CSONPATH_DO_FIND_ALL_PRE_LOOP int need_reloop_in = 0;
 
@@ -1434,7 +1473,7 @@ static int csonpath_sync_root_obj(CSONPATH_JSON parent, CSONPATH_JSON to_update)
 #define CSONPATH_DO_FIND_ALL_OUT return nb_res;
 
 #define CSONPATH_PRE_GET_ROOT						\
-    int to_check = *walker;						\
+    int to_check = walker[1];						\
     if (csonpath_is_endish_inst(to_check))  { \
 	CSONPATH_GETTER_ERR("can't update root ($)\n");			\
 	return CSONPATH_NONE_FOUND_RET;					\

{csonpath-0.15.0 → csonpath-0.16.0}/csonpath_do.h

@@ -36,8 +36,8 @@
 #define CSONPATH_DO_POST_FIND_ARRAY
 #endif
 
-#ifndef CSONPATH_DO_EXTRA_DECLATION
-#define CSONPATH_DO_EXTRA_DECLATION
+#ifndef CSONPATH_DO_EXTRA_DECLARATION
+#define CSONPATH_DO_EXTRA_DECLARATION
 #endif
 
 #ifndef CSONPATH_DO_FIND_ALL_CLEAUP
@@ -121,7 +121,7 @@ static CSONPATH_DO_RET_TYPE csonpath_do_internal(const struct csonpath cjp[const
 						 CSONPATH_JSON origin,
 						 CSONPATH_JSON value,
 						 CSONPATH_JSON ctx,
-						 const char *walker CSONPATH_DO_EXTRA_DECLATION);
+						 const char *walker CSONPATH_DO_EXTRA_DECLARATION);
 
 
 #define csonpath_do_dotdot__(name) CATCAT(csonpath_, name, _dotdot)
@@ -132,7 +132,7 @@ static CSONPATH_DO_RET_TYPE csonpath_do_dotdot(const struct csonpath cjp[const s
 					       CSONPATH_JSON origin,
 					       CSONPATH_JSON tmp,
 					       CSONPATH_JSON ctx,
-					       const char *walker CSONPATH_DO_EXTRA_DECLATION)
+					       const char *walker CSONPATH_DO_EXTRA_DECLARATION)
 {
     CSONPATH_JSON el;
     CSONPATH_DO_DECLARATION;
@@ -181,7 +181,7 @@ static CSONPATH_DO_RET_TYPE csonpath_do_internal(const struct csonpath cjp[const
 						 CSONPATH_JSON origin,
 						 CSONPATH_JSON value,
 						 CSONPATH_JSON ctx,
-						 const char *walker CSONPATH_DO_EXTRA_DECLATION)
+						 const char *walker CSONPATH_DO_EXTRA_DECLARATION)
 {
     CSONPATH_JSON tmp = value;
     CSONPATH_DO_DECLARATION;
@@ -218,7 +218,7 @@ static CSONPATH_DO_RET_TYPE csonpath_do_internal(const struct csonpath cjp[const
 	    CSONPATH_JSON el;
 	    int operation_in = *walker, operation = *walker;
 	    const char *owalker;
-	    int filter_next_in = *(walker+1), filter_next = *(walker+1);
+	    int filter_next_in = (unsigned char)*(walker+1), filter_next = (unsigned char)*(walker+1);
 	    const char *next = walker + 2;
 	    int foreach_idx;
 
@@ -504,7 +504,7 @@ static CSONPATH_DO_RET_TYPE csonpath_do_(struct csonpath cjp[static 1],
 #undef CSONPATH_DO_EXTRA_ARGS_IN
 #undef CSONPATH_DO_EXTRA_ARGS_FIND_ALL
 #undef CSONPATH_DO_EXTRA_ARGS
-#undef CSONPATH_DO_EXTRA_DECLATION
+#undef CSONPATH_DO_EXTRA_DECLARATION
 #undef CSONPATH_DO_FIND_ALL_PRE_LOOP
 #undef CSONPATH_DO_FOREACH_PRE_SET
 #undef CSONPATH_DO_GET_ALL_OUT

{csonpath-0.15.0 → csonpath-0.16.0}/csonpath_json-c.h

@@ -23,7 +23,7 @@ typedef void (*json_c_callback)(json_object *, struct csonpath_child_info *, jso
 #define CSONPATH_CALLBACK_DATA void *
 
 #define CSONPATH_CALL_CALLBACK(callback, ctx, child_info, tmp, udata)	\
-  callback(ctx, child_info, tmp, udata)
+  (callback(ctx, child_info, tmp, udata), 0)
 
 
 #define CSONPATH_NEED_FOREACH_REDO(o)		\
@@ -122,27 +122,29 @@ typedef void (*json_c_callback)(json_object *, struct csonpath_child_info *, jso
 #define CSONPATH_NEW_OBJECT() json_object_new_object()
 
 static int json_object_try_object_add(struct json_object *obj, const char * const at,
-				      struct json_object *el)
+				      struct json_object *el, int do_incref)
 {
     if (!CSONPATH_IS_OBJ(obj)) {
 	return -1;
     }
+    if (do_incref) json_object_get(el);
     json_object_object_add(obj, at, el);
     return 1;
 }
 
 static int json_array_try_put(struct json_object *obj, int at,
-			      struct json_object *el)
+			      struct json_object *el, int do_incref)
 {
     if (!CSONPATH_IS_ARRAY(obj)) {
 	return -1;
     }
+    if (do_incref) json_object_get(el);
     json_object_array_put_idx(obj, at, el);
     return 1;
 }
 
-#define CSONPATH_APPEND_AT(array, at, el)		\
-    _Generic((at),					\
+#define CSONPATH_APPEND_AT(array, at, el, do_incref)		\
+    _Generic((at),						\
 	     int: json_array_try_put,			\
 	     unsigned int: json_array_try_put,		\
 	     long: json_array_try_put,			\
@@ -151,11 +153,11 @@ static int json_array_try_put(struct json_object *obj, int at,
 	     unsigned long long: json_array_try_put,	\
 	     const char *: json_object_try_object_add,	\
 	     char *: json_object_try_object_add		\
-	) (array, at, el)
+	) (array, at, el, do_incref)
 
-#define CSONPATH_ARRAY_APPEND_INCREF(array, el) ({	\
-      json_object_get(el);				\
-      json_object_array_add(array, el);			\
+#define CSONPATH_ARRAY_APPEND(array, el) ({	\
+      json_object_get(el);			\
+      json_object_array_add(array, el);		\
     })
 
 static struct json_object *csonpath_json_c_get(struct json_object *obj,

{csonpath-0.15.0 → csonpath-0.16.0}/csonpath_python.c

@@ -33,9 +33,6 @@
 #define CSONPATH_GET_STR(obj)			\
     PyUnicode_AsUTF8(obj)
 
-#define CSONPATH_DECREF(obj)			\
-  Py_DECREF(obj);
-
 #define CSONPATH_GET_NUM(obj)			\
     PyLong_AsLong(obj)
 
@@ -68,15 +65,23 @@
 
 #define CSONPATH_CALLBACK_DATA PyObject *
 
-#define CSONPATH_CALL_CALLBACK(callback, ctx, child_info, tmp, udata) do { \
+#define CSONPATH_CALL_CALLBACK(callback, ctx, child_info, tmp, udata) \
+    ({								\
+	int _cb_ok = 0;							\
 	PyObject *arglist;						\
+	PyObject *_cb_ret;						\
 	if (child_info->type == CSONPATH_STR)				\
 	    arglist = Py_BuildValue("(OsOO)", ctx, child_info->key, tmp, udata); \
 	else								\
 	    arglist = Py_BuildValue("(OiOO)", ctx, child_info->idx, tmp, udata); \
-	PyObject_CallObject(callback, arglist);				\
+	_cb_ret = PyObject_CallObject(callback, arglist);		\
 	Py_DECREF(arglist);						\
-    } while (0)
+	if (!_cb_ret)							\
+	    _cb_ok = -1;						\
+	else								\
+	    Py_DECREF(_cb_ret);						\
+	_cb_ok;								\
+    })
 
 /* assuming each modification of the object need to go out of the loop */
 #define CSONPATH_NEED_FOREACH_REDO(o)	1
@@ -90,13 +95,10 @@
 
 #define CSONPATH_ARRAY_APPEND(list, el) PyList_Append(list, el)
 
-/* I don't think incrref is needed with python */
-#define CSONPATH_ARRAY_APPEND_INCREF(array, el) ({	\
-      PyList_Append(array, el);				\
-    })
 
-static int pydict_try_setitemstring(PyObject *obj,  const char * const at, PyObject *el)
+static int pydict_try_setitemstring(PyObject *obj, const char * const at, PyObject *el, int do_incref)
 {
+    (void)do_incref;
     if (!PyDict_Check(obj)) {
 	PyObject* repr = PyObject_Repr(obj);
 	PyObject* str = PyUnicode_AsEncodedString(repr, "utf-8", "~E~");
@@ -107,12 +109,18 @@ static int pydict_try_setitemstring(PyObject *obj,  const char * const at, PyObj
 	Py_XDECREF(str);
 	return -1;
     }
-    PyDict_SetItemString(obj, at, el);
+    if (!at) {
+        PyErr_SetString(PyExc_TypeError, "dict keys must be strings");
+        return -1;
+    }
+    if (PyDict_SetItemString(obj, at, el) < 0)
+	return -1;
     return 1;
 }
 
-static int python_set_or_insert_item(PyObject *array,  Py_ssize_t at, PyObject *el)
+static int python_set_or_insert_item(PyObject *array, Py_ssize_t at, PyObject *el, int do_incref)
 {
+    (void)do_incref;
     if (!PyList_Check(array)) {
 	PyErr_Format(PyExc_ValueError, "Unable to follow path: List expected");
 	return -1;
@@ -125,23 +133,25 @@ static int python_set_or_insert_item(PyObject *array,  Py_ssize_t at, PyObject *
 	PyList_Insert(array, at, el);
     } else {
 	Py_INCREF(el);
-	if (PyList_SetItem(array, at, el) < 0)
-	  Py_DECREF(el);
+	if (PyList_SetItem(array, at, el) < 0) {
+	    Py_DECREF(el);
+	    return -1;
+	}
     }
     return 1;
 }
 
-#define CSONPATH_APPEND_AT(array, at, el)			\
-    _Generic((at),						\
-	     int: python_set_or_insert_item,			\
-	     unsigned int: python_set_or_insert_item,		\
-	     long: python_set_or_insert_item,			\
-	     unsigned long: python_set_or_insert_item,		\
-	     long long: python_set_or_insert_item,		\
-	     unsigned long long: python_set_or_insert_item,	\
-	     const char *: pydict_try_setitemstring,		\
-	     char *: pydict_try_setitemstring			\
-	) (array, at, el)
+#define CSONPATH_APPEND_AT(array, at, el, do_incref)			\
+    _Generic((at),							\
+	     int: python_set_or_insert_item,				\
+	     unsigned int: python_set_or_insert_item,			\
+	     long: python_set_or_insert_item,				\
+	     unsigned long: python_set_or_insert_item,			\
+	     long long: python_set_or_insert_item,			\
+	     unsigned long long: python_set_or_insert_item,		\
+	     const char *: pydict_try_setitemstring,			\
+	     char *: pydict_try_setitemstring				\
+	) (array, at, el, do_incref)
 
 
 #ifdef __TINYC__
@@ -193,6 +203,11 @@ static int python_set_or_insert_item(PyObject *array,  Py_ssize_t at, PyObject *
     CSONPATH_PRAGMA("GCC unroll 8")					\
     for (intptr_t key_idx = 0; key_idx < array_len_; ++key_idx) {	\
       el = PyList_GetItem(obj, key_idx);				\
+      if (!el) {							\
+        PyErr_SetString(PyExc_RuntimeError,				\
+                        "list was modified during iteration");		\
+        break;								\
+      }									\
       code								\
 	}								\
   }
@@ -298,6 +313,10 @@ static PyObject *find_first(PyCsonPathObject *self, PyObject* args)
 
 static PyObject *print_instructions(PyCsonPathObject *self, PyObject *args, PyObject *kwds)
 {
+    if (!self->cp) {
+        PyErr_SetString(PyExc_RuntimeError, "compiled path is NULL");
+        return NULL;
+    }
     csonpath_print_instruction(self->cp);
     Py_RETURN_NONE;
 }
@@ -309,8 +328,9 @@ static PyObject *callback(PyCsonPathObject *self, PyObject* args)
     if (!PyArg_ParseTuple(args, "OO|O", &json, &callback, &udata))
 	BAD_ARG();
     int ret = csonpath_callback(self->cp, json, callback, udata);
-    if (PyErr_Occurred())
+    if (PyErr_Occurred() || ret < 0) {
         return NULL;
+    }
     return PyLong_FromLong(ret);
 }
 
@@ -321,7 +341,7 @@ static PyObject *do_remove(PyCsonPathObject *self, PyObject* args)
   if (!PyArg_ParseTuple(args, "O", &json))
     BAD_ARG();
   int ret = csonpath_remove(self->cp, json);
-  if (PyErr_Occurred())
+  if (PyErr_Occurred() || ret < 0)
       return NULL;
   return PyLong_FromLong(ret);
 }
@@ -365,10 +385,22 @@ static void PyCsonPath_dealloc(PyCsonPathObject *self) {
 static PyObject *PyCsonPath_set_path(PyCsonPathObject *self, PyObject* args) {
     const char *new_path;
     if (!PyArg_ParseTuple(args, "s", &new_path))
-      return Py_False;
+      return NULL;
     if (!new_path) return Py_False;
 
-    self->cp = csonpath_set_path(self->cp, new_path);
+    struct csonpath *new_cjp = csonpath_new_ex(new_path, CSONPATH_NO_DETROY);
+    if (!new_cjp) {
+        PyErr_NoMemory();
+        return NULL;
+    }
+    if (new_cjp->compile_error) {
+        PyErr_Format(PyExc_ValueError, "compilation fail %s",
+                     new_cjp->compile_error);
+        csonpath_destroy(new_cjp);
+        return NULL;
+    }
+    csonpath_destroy(self->cp);
+    self->cp = new_cjp;
     return Py_True;
 }
 

{csonpath-0.15.0 → csonpath-0.16.0}/csonpath_yyjson.h

@@ -63,7 +63,7 @@ typedef void (*yyjson_val_callback)(yyjson_val *, struct csonpath_child_info *,
     })
 
 #define CSONPATH_CALL_CALLBACK(callback, ctx, child_info, tmp, udata)   \
-    callback(ctx, child_info, tmp, udata)
+    (callback(ctx, child_info, tmp, udata), 0)
 
 
 #define CSONPATH_FOREACH(obj, el, code)		\
@@ -111,7 +111,7 @@ typedef void (*yyjson_val_callback)(yyjson_val *, struct csonpath_child_info *,
 #define CSONPATH_OBJ_CLEAR(o)			\
   fail_on_non_mut(NULL)
 
-#define CSONPATH_APPEND_AT(array, at, el)	\
+#define CSONPATH_APPEND_AT(array, at, el, do_incref)	\
   fail_on_non_mut(NULL)				\
 
 
@@ -134,7 +134,7 @@ struct find_all_ret {
 
 #define CSONPATH_FIND_ALL_RET struct find_all_ret *
 
-#define CSONPATH_ARRAY_APPEND_INCREF(ar, o)		\
+#define CSONPATH_ARRAY_APPEND(ar, o)		\
     _Generic(ar,					\
 	     struct find_all_ret *: find_all_append,	\
 	     yyjson_val *: fail_on_non_mut)(ar, o)

{csonpath-0.15.0 → csonpath-0.16.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "csonpath"
-version = "0.15.0"
+version = "0.16.0"
 readme = "README.md"
 
 [tool.setuptools]
@@ -27,7 +27,7 @@ test-command = "pytest {project}/tests/python"
 before-build = "choco install mingw -y"
 
 [tool.bumpversion]
-current_version = "0.15.0"
+current_version = "0.16.0"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"