diff mbox

[FFmpeg-devel] avcodec/rawdec: check for side data before checking its size

Message ID 20161104013458.11664-1-jamrial@gmail.com
State Accepted
Commit 51e329918dc1826de7451541cb15bef3b9bfe138
Headers show

Commit Message

James Almer Nov. 4, 2016, 1:34 a.m. UTC 
Fixes valgrind warnings about usage of uninitialized values.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavcodec/rawdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michael Niedermayer Nov. 4, 2016, 11:31 a.m. UTC | #1 
On Thu, Nov 03, 2016 at 10:34:58PM -0300, James Almer wrote:
> Fixes valgrind warnings about usage of uninitialized values.
> 
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  libavcodec/rawdec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

ok

thanks

[...]
James Almer Nov. 5, 2016, 2:40 a.m. UTC | #2 
On 11/4/2016 8:31 AM, Michael Niedermayer wrote:
> On Thu, Nov 03, 2016 at 10:34:58PM -0300, James Almer wrote:
>> Fixes valgrind warnings about usage of uninitialized values.
>>
>> Signed-off-by: James Almer <jamrial@gmail.com>
>> ---
>>  libavcodec/rawdec.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> ok
> 
> thanks

Applied.
diff mbox

Patch

diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c
index 45cf27f..e53eb2e 100644
--- a/libavcodec/rawdec.c
+++ b/libavcodec/rawdec.c
@@ -369,7 +369,7 @@  static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
                                                      &pal_size);
         int ret;
 
-        if (pal_size != AVPALETTE_SIZE) {
+        if (pal && pal_size != AVPALETTE_SIZE) {
             av_log(avctx, AV_LOG_ERROR, "Palette size %d is wrong\n", pal_size);
             pal = NULL;
         }