aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-02-15 23:26:19 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-02-23 14:28:10 +0100
commit656770e2aacf44df2be01ee7fd60b035fd42c675 (patch)
tree43c5616733254209ad2c431eac49996b70250928
parent4a28a3ddc4eb7322409f062f422c676f93d95ac1 (diff)
downloadandroid_external_ffmpeg-656770e2aacf44df2be01ee7fd60b035fd42c675.tar.gz
android_external_ffmpeg-656770e2aacf44df2be01ee7fd60b035fd42c675.tar.bz2
android_external_ffmpeg-656770e2aacf44df2be01ee7fd60b035fd42c675.zip
avcodec/hevc: make *ps_id unsigned
Fixes integer overflow Fixes out of array accesses Fixes 2f65e7dbd02a12f426a423bd7bf880b4-signal_sigsegv_127c952_2793_cov_2517424539_RPLM_A_qualcomm_4.bit Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit d1e6602665d5ec1b7e211ab27b298c26139f82cc) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/hevc.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h
index 90953ad59a..0d4f3e6373 100644
--- a/libavcodec/hevc.h
+++ b/libavcodec/hevc.h
@@ -373,7 +373,7 @@ typedef struct ScalingList {
} ScalingList;
typedef struct HEVCSPS {
- int vps_id;
+ unsigned vps_id;
int chroma_format_idc;
uint8_t separate_colour_plane_flag;
@@ -454,7 +454,7 @@ typedef struct HEVCSPS {
} HEVCSPS;
typedef struct HEVCPPS {
- int sps_id; ///< seq_parameter_set_id
+ unsigned sps_id; ///< seq_parameter_set_id
uint8_t sign_data_hiding_flag;