diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-07-18 12:58:40 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-07-18 19:59:34 +0000 |
| commit | 6df8e83e5754a883e768573a0bae8199f1c8fb9c (patch) | |
| tree | b79bf26dc01ff84821c8e20870269fbb03bb4c38 /wiretap | |
| parent | d54f372c999ce1bf1437a7718301265e2c1f15cb (diff) | |
block->options is never null; don't check for it.
A wtap_block_t always has an array of options, even if it's empty.
Fixes CID 1364135.
Change-Id: Ib1ba791ddcac078ec34def321d63d140c5576037
Reviewed-on: https://code.wireshark.org/review/16535
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/wtap_opttypes.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/wiretap/wtap_opttypes.c b/wiretap/wtap_opttypes.c index 0a76c390b8..d1a9c95fd6 100644 --- a/wiretap/wtap_opttypes.c +++ b/wiretap/wtap_opttypes.c @@ -246,8 +246,7 @@ void wtap_block_free(wtap_block_t block) g_free(block->mandatory_data); wtap_block_free_options(block); - if (block->options != NULL) - g_array_free(block->options, TRUE); + g_array_free(block->options, TRUE); g_free(block); } } |