diff options
| author | julienmalik <julienmalik@users.noreply.github.com> | 2016-05-02 14:34:32 +0200 |
|---|---|---|
| committer | julienmalik <julienmalik@users.noreply.github.com> | 2016-05-02 14:34:32 +0200 |
| commit | ba0cf122f6820d38a7a5acc65b9d64392dd94e83 (patch) | |
| tree | 68c70e55f6a306eb76a1996e2d1068b516c35426 /src/lib | |
| parent | da56086e012117edb278408e6062d1b890b53576 (diff) | |
| parent | e1e018a8dc8c96f45486768356b7fb370ae0527c (diff) | |
Merge pull request #767 from julienmalik/fix_memset_null_pointer
Fix UBSan gcc warning for first arg to memset non null
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/openjp2/t1.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/openjp2/t1.c b/src/lib/openjp2/t1.c index 1e9480bd..1bf7205e 100644 --- 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); |