Fix segmentation fault when reading compressed v5 MAT file with opaqu…

…e class * Skip unknown/undocumented opaque class * As reported by #40
tbeu · Jul 11, 2016 · 3b6dc8f · 3b6dc8f
1 parent 8e434f1
commit 3b6dc8f
Show file tree

Hide file tree

Showing 3 changed files with 210 additions and 197 deletions.
diff --git a/src/mat.c b/src/mat.c
@@ -1505,14 +1505,16 @@ Mat_VarGetSize(matvar_t *matvar)
             matvar_t **fields = (matvar_t**)matvar->data;
             if ( NULL != fields )
                 for ( i = 0; i < nmemb*nfields; i++ )
-                    bytes += Mat_VarGetSize(fields[i]);
+                    if ( NULL != fields[i] )
+                        bytes += Mat_VarGetSize(fields[i]);
         }
     } else if ( matvar->class_type == MAT_C_CELL ) {
         matvar_t **cells = (matvar_t**)matvar->data;
         if ( NULL != cells ) {
             int ncells = matvar->nbytes / matvar->data_size;
             for ( i = 0; i < ncells; i++ )
-                bytes += Mat_VarGetSize(cells[i]);
+                if ( NULL != cells[i] )
+                    bytes += Mat_VarGetSize(cells[i]);
         }
     } else {
         int nmemb = 1;