diff options
| author | James Zern <jzern@google.com> | 2015-09-26 01:52:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-09-26 01:52:52 +0000 |
| commit | db2056f341e86218d3f7387023dc3b2d57258e8d (patch) | |
| tree | d9e3cf6fa72106315dc53281aca99e62de98a2a4 | |
| parent | fcd6414e77bf9c2e5062996c6e5e19689a2bda5f (diff) | |
| parent | cf8f6559ce1b99df99bcda87a0f4d6ec5e29d571 (diff) | |
| download | libvpx-db2056f341e86218d3f7387023dc3b2d57258e8d.tar libvpx-db2056f341e86218d3f7387023dc3b2d57258e8d.tar.gz libvpx-db2056f341e86218d3f7387023dc3b2d57258e8d.tar.bz2 libvpx-db2056f341e86218d3f7387023dc3b2d57258e8d.zip | |
Merge "vp9/10 encoder: prevent NULL access on failure"
| -rw-r--r-- | vp10/encoder/encoder.c | 5 | ||||
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/vp10/encoder/encoder.c b/vp10/encoder/encoder.c index b455bbbb4..1d95d7dc2 100644 --- a/vp10/encoder/encoder.c +++ b/vp10/encoder/encoder.c @@ -1820,14 +1820,15 @@ VP10_COMP *vp10_create_compressor(VP10EncoderConfig *oxcf, snprintf((H) + strlen(H), sizeof(H) - strlen(H), (T), (V)) void vp10_remove_compressor(VP10_COMP *cpi) { - VP10_COMMON *const cm = &cpi->common; + VP10_COMMON *cm; unsigned int i; int t; if (!cpi) return; - if (cpi && (cm->current_video_frame > 0)) { + cm = &cpi->common; + if (cm->current_video_frame > 0) { #if CONFIG_INTERNAL_STATS vpx_clear_system_state(); diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index eb0d3608f..b2e800d4c 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -1930,14 +1930,15 @@ VP9_COMP *vp9_create_compressor(VP9EncoderConfig *oxcf, snprintf((H) + strlen(H), sizeof(H) - strlen(H), (T), (V)) void vp9_remove_compressor(VP9_COMP *cpi) { - VP9_COMMON *const cm = &cpi->common; + VP9_COMMON *cm; unsigned int i; int t; if (!cpi) return; - if (cpi && (cm->current_video_frame > 0)) { + cm = &cpi->common; + if (cm->current_video_frame > 0) { #if CONFIG_INTERNAL_STATS vpx_clear_system_state(); |