Merge pull request #767 from julienmalik/fix_memset_null_pointer

Fix UBSan gcc warning for first arg to memset non null
uclouvain · May 2, 2016 · ba0cf12 · ba0cf12
2 parents da56086 + e1e018a
commit ba0cf12
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/lib/openjp2/t1.c b/src/lib/openjp2/t1.c
@@ -1180,7 +1180,10 @@ static OPJ_BOOL opj_t1_allocate_buffers(
 			}
 			t1->datasize=datasize;
 		}
-		memset(t1->data,0,datasize * sizeof(OPJ_INT32));
+		/* memset first arg is declared to never be null by gcc */
+		if (t1->data != NULL) {
+			memset(t1->data,0,datasize * sizeof(OPJ_INT32));
+		}
 	}
 	t1->flags_stride=w+2;
 	flagssize=t1->flags_stride * (h+2);