King_DuckZ/libbpg
1
0
Fork 0
forked from mirror/libbpg
Code Issues Pull requests Releases Wiki Activity

libbpg-0.9.8

Browse source
This commit is contained in:
King_DuckZ 2021-03-15 14:26:22 +01:00
parent 1261ac523b
commit 62bba2b5bf
6 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
version 0.9.8:
- x265 library compilation fixes
- buffer overflow fixes
version 0.9.7: version 0.9.7:
- Increased the memory size of the JS decoder to 32 MiB and avoid - Increased the memory size of the JS decoder to 32 MiB and avoid

2
VERSION
View file

@ -1 +1 @@
0.9.7 0.9.8

10
bpgenc.c
View file

@ -688,6 +688,14 @@ Image *image_alloc(int w, int h, BPGImageFormatEnum format, int has_alpha,
{ {
Image *img; Image *img;
int i, linesize, w1, h1, c_count; int i, linesize, w1, h1, c_count;
uint64_t size;
/* XXX: support large images ? */
size = (uint64_t)w * (uint64_t)h * 2;
if (size > INT32_MAX) {
fprintf(stderr, "Image is too large\n");
exit(1);
}
img = malloc(sizeof(Image)); img = malloc(sizeof(Image));
memset(img, 0, sizeof(*img)); memset(img, 0, sizeof(*img));
@ -1088,7 +1096,7 @@ Image *read_png(BPGMetaData **pmd,
static BPGMetaData *jpeg_get_metadata(jpeg_saved_marker_ptr first_marker) static BPGMetaData *jpeg_get_metadata(jpeg_saved_marker_ptr first_marker)
{ {
static const char app1_exif[] = "Exif"; static const char app1_exif[] = "Exif\0";
static const char app1_xmp[] = "http://ns.adobe.com/xap/1.0/"; static const char app1_xmp[] = "http://ns.adobe.com/xap/1.0/";
static const char app2_iccp[] = "ICC_PROFILE"; static const char app2_iccp[] = "ICC_PROFILE";
jpeg_saved_marker_ptr marker; jpeg_saved_marker_ptr marker;

2
libbpg.c
View file

@ -232,7 +232,7 @@ static int build_msps(uint8_t **pbuf, int *pbuf_len,
input_data += len; input_data += len;
input_data_len -= len; input_data_len -= len;
buf_len = 4 + 2 + msps_len * 2 + 4 + (input_data_len - len); buf_len = 4 + 2 + msps_len * 2;
buf = av_malloc(buf_len); buf = av_malloc(buf_len);
idx = 0; idx = 0;

2
x265/source/common/param.cpp
View file

@ -1396,7 +1396,7 @@ char *x265_param2string(x265_param* p)
return NULL; return NULL;
#define BOOL(param, cliopt) \ #define BOOL(param, cliopt) \
s += sprintf(s, " %s", (param) ? cliopt : "no-"cliopt); s += sprintf(s, " %s", (param) ? cliopt : "no-" cliopt);
s += sprintf(s, "%dx%d", p->sourceWidth,p->sourceHeight); s += sprintf(s, "%dx%d", p->sourceWidth,p->sourceHeight);
s += sprintf(s, " fps=%u/%u", p->fpsNum, p->fpsDenom); s += sprintf(s, " fps=%u/%u", p->fpsNum, p->fpsDenom);

2
x265/source/encoder/ratecontrol.cpp
View file

@ -49,7 +49,7 @@ namespace {
{\ {\
bErr = 0;\ bErr = 0;\
p = strstr(opts, opt "=");\ p = strstr(opts, opt "=");\
char* q = strstr(opts, "no-"opt);\ char* q = strstr(opts, "no-" opt);\
if (p && sscanf(p, opt "=%d" , &i) && param_val != i)\ if (p && sscanf(p, opt "=%d" , &i) && param_val != i)\
bErr = 1;\ bErr = 1;\
else if (!param_val && !q && !p)\ else if (!param_val && !q && !p)\