virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-23 04:24:35 +02:00
Code Issues Releases Activity

Fixed crash in palette handling when converting certain .png images to .pcx or .bmp.

Browse Source 
The existing code expected a palette buffer holding 256 uint32_t's allocated in the data[1] field of the AVFrame structure, but data[1] was NULL. The bug is fixed by using a fixed local array (palette256) to hold the palette instead.

This solves http://ffmpeg.org/trac/ffmpeg/ticket/833

Signed-off-by: Frank Vernaillen <fr_ve@hotmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Frank Vernaillen 2011-12-27 20:47:49 +01:00 committed by Michael Niedermayer
parent 29c1b258ab
commit ad1c502557
2 changed files with 13 additions and 1 deletions

7
libavcodec/bmpenc.c

@ -24,6 +24,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "bytestream.h" #include "bytestream.h"
#include "bmp.h" #include "bmp.h"
#include <assert.h>
static const uint32_t monoblack_pal[] = { 0x000000, 0xFFFFFF }; static const uint32_t monoblack_pal[] = { 0x000000, 0xFFFFFF };
static const uint32_t rgb565_masks[] = { 0xF800, 0x07E0, 0x001F }; static const uint32_t rgb565_masks[] = { 0xF800, 0x07E0, 0x001F };
@ -69,6 +70,7 @@ static int bmp_encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_s
AVFrame * const p= (AVFrame*)&s->picture; AVFrame * const p= (AVFrame*)&s->picture;
int n_bytes_image, n_bytes_per_row, n_bytes, i, n, hsize; int n_bytes_image, n_bytes_per_row, n_bytes, i, n, hsize;
const uint32_t *pal = NULL; const uint32_t *pal = NULL;
uint32_t palette256[256];
int pad_bytes_per_row, pal_entries = 0, compression = BMP_RGB; int pad_bytes_per_row, pal_entries = 0, compression = BMP_RGB;
int bit_count = avctx->bits_per_coded_sample; int bit_count = avctx->bits_per_coded_sample;
uint8_t *ptr; uint8_t *ptr;
@ -87,7 +89,10 @@ static int bmp_encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_s
case PIX_FMT_RGB4_BYTE: case PIX_FMT_RGB4_BYTE:
case PIX_FMT_BGR4_BYTE: case PIX_FMT_BGR4_BYTE:
case PIX_FMT_GRAY8: case PIX_FMT_GRAY8:
ff_set_systematic_pal2((uint32_t*)p->data[1], avctx->pix_fmt); assert(bit_count == 8);
ff_set_systematic_pal2(palette256, avctx->pix_fmt);
pal = palette256;
break;
case PIX_FMT_PAL8: case PIX_FMT_PAL8:
pal = (uint32_t *)p->data[1]; pal = (uint32_t *)p->data[1];
break; break;

7
libavcodec/pcxenc.c

@ -28,6 +28,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "bytestream.h" #include "bytestream.h"
#include "libavutil/imgutils.h"
typedef struct PCXContext { typedef struct PCXContext {
AVFrame picture; AVFrame picture;
@ -105,6 +106,7 @@ static int pcx_encode_frame(AVCodecContext *avctx,
int bpp, nplanes, i, y, line_bytes, written; int bpp, nplanes, i, y, line_bytes, written;
const uint32_t *pal = NULL; const uint32_t *pal = NULL;
uint32_t palette256[256];
const uint8_t *src; const uint8_t *src;
*pict = *(AVFrame *)data; *pict = *(AVFrame *)data;
@ -126,6 +128,11 @@ static int pcx_encode_frame(AVCodecContext *avctx,
case PIX_FMT_RGB4_BYTE: case PIX_FMT_RGB4_BYTE:
case PIX_FMT_BGR4_BYTE: case PIX_FMT_BGR4_BYTE:
case PIX_FMT_GRAY8: case PIX_FMT_GRAY8:
bpp = 8;
nplanes = 1;
ff_set_systematic_pal2(palette256, avctx->pix_fmt);
pal = palette256;
break;
case PIX_FMT_PAL8: case PIX_FMT_PAL8:
bpp = 8; bpp = 8;
nplanes = 1; nplanes = 1;