Safely add to arrays + fix for #443 (#449)

* Make sure we reassign the pointer in array_append

* Fix case-sensitive comparison for devicestr

* Fix sanitizer tests

(cherry picked from commit 5c7813e)

Author: lantiga

src/backends/tensorflow.c

@@ -392,12 +392,12 @@ RAI_Model *RAI_ModelCreateTF(RAI_Backend backend, const char* devicestr, RAI_Mod
 
   char **inputs_ = array_new(char*, ninputs);
   for (long long i=0; i<ninputs; i++) {
-    array_append(inputs_, RedisModule_Strdup(inputs[i]));
+    inputs_ = array_append(inputs_, RedisModule_Strdup(inputs[i]));
   }
 
   char **outputs_ = array_new(char*, noutputs);
   for (long long i=0; i<noutputs; i++) {
-    array_append(outputs_, RedisModule_Strdup(outputs[i]));
+    outputs_ = array_append(outputs_, RedisModule_Strdup(outputs[i]));
   }
 
   char* buffer = RedisModule_Calloc(modellen, sizeof(*buffer));

src/background_workers.c

@@ -111,9 +111,10 @@ void *RedisAI_Run_ThreadMain(void *arg) {
         }
         evicted_items = array_new(queueItem *, run_queue_len);
         batch_rinfo = array_new(RedisAI_RunInfo *, run_queue_len);
-
-        array_append(evicted_items, item);
-        array_append(batch_rinfo, rinfo);
+        // We add the current item to the list of evicted items. If it's the
+        // first time around this will be the queue front.
+        evicted_items = array_append(evicted_items, item);
+        batch_rinfo = array_append(batch_rinfo, rinfo);
 
         if (rinfo->sctx) {
           break;
@@ -152,8 +153,10 @@ void *RedisAI_Run_ThreadMain(void *arg) {
             break;
           }
 
-          array_append(evicted_items, next_item);
-          array_append(batch_rinfo, next_rinfo);
+          // If all previous checks pass, then keep track of the item
+          // in the list of evicted items
+          evicted_items = array_append(evicted_items, next_item);
+          batch_rinfo = array_append(batch_rinfo, next_rinfo);
 
           current_batchsize += next_batchsize;
           next_item = queueNext(next_item);

src/dag.c

@@ -420,7 +420,7 @@ int RedisAI_DagRunSyntaxParser(RedisModuleCtx *ctx, RedisModuleString **argv,
   rinfo->use_local_context = 1;
   RAI_DagOp *currentDagOp = NULL;
   RAI_InitDagOp(&currentDagOp);
-  array_append(rinfo->dagOps, currentDagOp);
+  rinfo->dagOps = array_append(rinfo->dagOps, currentDagOp);
 
   int persistFlag = 0;
   int loadFlag = 0;
@@ -463,7 +463,7 @@ int RedisAI_DagRunSyntaxParser(RedisModuleCtx *ctx, RedisModuleString **argv,
         rinfo->dagNumberCommands++;
         RAI_DagOp *currentDagOp = NULL;
         RAI_InitDagOp(&currentDagOp);
-        array_append(rinfo->dagOps, currentDagOp);
+        rinfo->dagOps = array_append(rinfo->dagOps, currentDagOp);
       }
       chainingOpCount++;
     } else {

src/model.c

@@ -170,13 +170,29 @@ static void RAI_Model_AofRewrite(RedisModuleIO *aof, RedisModuleString *key, voi
   RedisModuleCtx *ctx = RedisModule_GetContextFromIO(aof);
 
   for (size_t i=0; i<model->ninputs; i++) {
-    array_append(inputs_, RedisModule_CreateString(ctx, model->inputs[i], strlen(model->inputs[i])));
+    inputs_ = array_append(inputs_, RedisModule_CreateString(ctx, model->inputs[i], strlen(model->inputs[i])));
   }
 
   for (size_t i=0; i<model->noutputs; i++) {
-    array_append(outputs_, RedisModule_CreateString(ctx, model->outputs[i], strlen(model->outputs[i])));
+    outputs_ = array_append(outputs_, RedisModule_CreateString(ctx, model->outputs[i], strlen(model->outputs[i])));
   }
 
+<<<<<<< HEAD
+=======
+  long long chunk_size = getModelChunkSize();
+  const size_t n_chunks = len / chunk_size + 1;
+  RedisModuleString **buffers_ = array_new(RedisModuleString*, n_chunks);
+
+  for (size_t i=0; i<n_chunks; i++) {
+    size_t chunk_len = i < n_chunks - 1 ? chunk_size : len % chunk_size;
+    buffers_ = array_append(buffers_, RedisModule_CreateString(ctx, buffer + i * chunk_size, chunk_len));
+  }
+
+  if (buffer) {
+    RedisModule_Free(buffer);
+  }
+
+>>>>>>> 4f51679... Safely add to arrays + fix for #443 (#449)
   const char* backendstr = RAI_BackendName(model->backend);
 
   RedisModule_EmitAOF(aof, "AI.MODELSET", "slccclclcvcvb",

src/tensor.c

@@ -825,7 +825,7 @@ int RAI_parseTensorSetArgs(RedisModuleCtx *ctx, RedisModuleString **argv, int ar
         return -1;
       }
       ndims++;
-      array_append(dims, dimension);
+      dims = array_append(dims, dimension);
       len *= dimension;
     }
   }

test/tests_sanitizer.py

@@ -12,7 +12,7 @@ def test_sanitizer_dagrun_mobilenet_v1(env):
     if (not TEST_TF or not TEST_PT):
         return
     con = env.getConnection()
-    mem_allocator = con.execute_command('info', 'memory')['mem_allocator']
+    mem_allocator = con.info()['mem_allocator']
     if 'jemalloc' in mem_allocator:
         print("exiting sanitizer test given we're not using stdlib allocator")
         return
@@ -48,7 +48,7 @@ def test_sanitizer_modelrun_mobilenet_v1(env):
     if (not TEST_TF or not TEST_PT):
         return
     con = env.getConnection()
-    mem_allocator = con.execute_command('info', 'memory')['mem_allocator']
+    mem_allocator = con.info()['mem_allocator']
     if 'jemalloc' in mem_allocator:
         print("exiting sanitizer test given we're not using stdlib allocator")
         return