24 lines
795 B
Diff
24 lines
795 B
Diff
diff -Nur openjpeg-2.3.1_old/src/bin/jpwl/convert.c openjpeg-2.3.1/src/bin/jpwl/convert.c
|
|
--- openjpeg-2.3.1_old/src/bin/jpwl/convert.c 2019-10-15 16:06:40.623000000 +0800
|
|
+++ openjpeg-2.3.1/src/bin/jpwl/convert.c 2019-10-15 16:08:59.642000000 +0800
|
|
@@ -1730,8 +1730,10 @@
|
|
|
|
if (!have_wh) {
|
|
s = skip_int(s, &ph->width);
|
|
+ if(s == NULL || *s == 0) return;
|
|
|
|
s = skip_int(s, &ph->height);
|
|
+ if(s == NULL || *s == 0) return;
|
|
|
|
have_wh = 1;
|
|
|
|
@@ -1744,6 +1746,7 @@
|
|
if (format == 2 || format == 3 || format == 5 || format == 6) {
|
|
/* P2, P3, P5, P6: */
|
|
s = skip_int(s, &ph->maxval);
|
|
+ if(s == NULL || *s == 0) return;
|
|
|
|
if (ph->maxval > 65535) {
|
|
return;
|
|
|