Fixes for issues spotted by infer

Smithsonian · Nov 29, 2024 · 83c4867 · 83c4867
1 parent 51e820d
commit 83c4867
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@
 README-orig.md
 README-xchange.md
 TODO
+infer-out
diff --git a/src/xjson.c b/src/xjson.c
@@ -371,7 +371,7 @@ static char *SkipSpaces(char *str, int *lineNumber) {
 }
 
 static char *GetToken(char *from) {
-  int l;
+  int l = 0;
   char *token;
 
   from = SkipSpaces(from, &l);
@@ -684,7 +684,7 @@ static void *ParseArray(char **pos, XType *type, int *ndim, int sizes[X_MAX_DIMS
     return NULL;
   }
 
-  next = SkipSpaces(++next, lineNumber);
+  next = SkipSpaces(next+1, lineNumber);
 
   for(n = 0; *next && *next != ']';) {
     XField *e;

diff --git a/src/xlookup.c b/src/xlookup.c
@@ -194,6 +194,7 @@ static int xLookupPutAllAsync(XLookupTable *tab, const char *prefix, const XStru
     if(f->type == X_STRUCT && recursive) {
       XStructure *sub = (XStructure *) f->value;
       char *p1 = (char *) malloc(lp + strlen(f->value) + 2 * sizeof(X_SEP) + 12);
+      x_check_alloc(p1);
 
       int count = xGetFieldCount(f);
       while(--count >= 0) {
@@ -205,6 +206,8 @@ static int xLookupPutAllAsync(XLookupTable *tab, const char *prefix, const XStru
 
         N += xLookupPutAllAsync(tab, p1, &sub[count], TRUE);
       }
+
+      free(p1);
     }
   }
 
@@ -225,6 +228,7 @@ static int xLookupRemoveAllAsync(XLookupTable *tab, const char *prefix, const XS
     if(f->type == X_STRUCT && recursive) {
       XStructure *sub = (XStructure *) f->value;
       char *p1 = (char *) malloc(lp + strlen(f->value) + 2 * sizeof(X_SEP) + 12);
+      x_check_alloc(p1);
 
       int count = xGetFieldCount(f);
       while(--count >= 0) {
@@ -236,6 +240,8 @@ static int xLookupRemoveAllAsync(XLookupTable *tab, const char *prefix, const XS
 
         N += xLookupRemoveAllAsync(tab, p1, &sub[count], TRUE);
       }
+
+      free(p1);
     }
   }