fixed another security issue

jkriege2 · May 21, 2024 · 4abede1 · 4abede1
1 parent 3a8d9cc
commit 4abede1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/src/tinymatwriter.cpp b/src/tinymatwriter.cpp
@@ -328,8 +328,11 @@ const char *TinyMATWriter_getVersion()
        else if (newsize < 1000 * 1024 * 1024) newsize = newsize * 3 / 2;
        else newsize = newsize * 6 / 5;
      }
-     file->filedata = (uint8_t*)realloc(file->filedata, newsize);
-     file->filedata_size = newsize;
+     auto newMem = (uint8_t*)realloc(file->filedata, newsize);
+     if (newMem) {
+        file->filedata=newMem;
+        file->filedata_size = newsize;
+     }
    }
 #endif
  }
@@ -615,8 +618,10 @@ TINYMAT_inlineattrib static void TinyMAT_writeDatElement_string(TinyMATWriterFil
     std::unique_ptr<int16_t[]> tmp;
     if (slen>0 && data) {
         tmp=std::unique_ptr<int16_t[]>(new int16_t[slen]);
-        for (uint32_t i=0; i<slen; i++) {
-            tmp[i]=data[i];
+        if (tmp) {
+            for (uint32_t i=0; i<slen; i++) {
+                tmp[i]=data[i];
+            }
         }
     }
     uint32_t cla=TINYMAT_miUINT16;

diff --git a/src/tinymatwriter.h b/src/tinymatwriter.h
@@ -384,12 +384,14 @@ inline void TinyMATWriter_writeMatrixND_rowmajor(TinyMATWriterFile* mat, const c
               freeDat=false;
             } else {
               dat=new T[nentries];//(T*)malloc(nentries*sizeof(T));
-              datOut=dat;
-              freeDat=true;
-              for (uint32_t m=0; m<nmatrices; m++) {
-                  for(uint32_t r=0; r<rows; r++) {
-                      for (uint32_t c=0; c<cols; c++) {
-                          dat[m*cols*rows+c*rows+r]=data_real[m*cols*rows+r*cols+c];
+              if (dat) {
+                  datOut=dat;
+                  freeDat=true;
+                  for (uint32_t m=0; m<nmatrices; m++) {
+                      for(uint32_t r=0; r<rows; r++) {
+                          for (uint32_t c=0; c<cols; c++) {
+                              dat[m*cols*rows+c*rows+r]=data_real[m*cols*rows+r*cols+c];
+                          }
                       }
                   }
               }