fixes for CRAN

coolbutuseless · Jan 22, 2024 · 84b2eb6 · 84b2eb6
1 parent 045198a
commit 84b2eb6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: yyjsonr
 Type: Package
 Title: Fast JSON Parser and Generator 
-Version: 0.1.17
+Version: 0.1.17.9000
 Authors@R: c(
     person("Mike", "Cheng", role = c("aut", "cre", 'cph'), 
     email = "mikefc@coolbutuseless.com"),

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,11 @@
 
+
+# yyjsonr 0.1.18 2024-01-22
+
+* Fixes for CRAN
+    * Adjust pointer arithmetic when calling `output_verbose_error()` to
+      avoid overflow of `size_t`
+
 # yyjsonr 0.1.17 2024-01-20
 
 * Fixes for CRAN

diff --git a/src/R-yyjson-parse.c b/src/R-yyjson-parse.c
@@ -1807,8 +1807,7 @@ SEXP json_as_robj(yyjson_val *val, parse_options *opt) {
 #define ERR_CONTEXT 20
 void output_verbose_error(const char *str, yyjson_read_err err) {
   // Slice off a bit of the string within +/- ERR_CONTEXT of the error pos
-  size_t min_idx = err.pos - ERR_CONTEXT;
-  min_idx = min_idx < 0 ? 0 : min_idx;
+  size_t min_idx = err.pos < ERR_CONTEXT ? 0 : err.pos - ERR_CONTEXT;
   size_t max_idx = err.pos + ERR_CONTEXT;
   max_idx = max_idx > strlen(str) ? strlen(str) : max_idx;