Skip to content

ext/standard: Reject out-of-range XBM dimensions #25293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iliaal wants to merge 1 commit into
base: PHP-8.4
Choose a base branch
from
Open

ext/standard: Reject out-of-range XBM dimensions #25293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ PHP NEWS
. Fix trampoline leak when object construction fails for lazy object.
(ndossche)

- Standard:
. Fixed getimagesize() reporting wrapped dimensions for XBM images with
out-of-range width or height. (Ilia Alshanetsky)

- Streams:
. Fixed bug GH-22063 (Stream filter chain UAF on self-removal during
callback). (Ilia Alshanetsky)
Expand Down
42 changes: 24 additions & 18 deletions ext/standard/image.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1000,7 +1000,9 @@ static int php_get_xbm(php_stream *stream, struct gfxinfo **result)
char *fline;
char *iname;
char *type;
int value;
char *end;
int offset;
long value;
unsigned int width = 0, height = 0;

if (result) {
Expand All @@ -1017,25 +1019,29 @@ static int php_get_xbm(php_stream *stream, struct gfxinfo **result)
break;
}
iname = estrdup(fline); /* simple way to get necessary buffer of required size */
if (sscanf(fline, "#define %s %d", iname, &value) == 2) {
if (!(type = strrchr(iname, '_'))) {
type = iname;
} else {
type++;
}
if (sscanf(fline, "#define %s %n", iname, &offset) == 1) {
errno = 0;
value = strtol(fline + offset, &end, 10);
if (end != fline + offset && errno == 0 && value > 0 && value <= INT_MAX) {
if (!(type = strrchr(iname, '_'))) {
type = iname;
} else {
type++;
}

if (!strcmp("width", type)) {
width = (unsigned int) value;
if (height) {
efree(iname);
break;
if (!strcmp("width", type)) {
width = (unsigned int) value;
if (height) {
efree(iname);
break;
}
}
}
if (!strcmp("height", type)) {
height = (unsigned int) value;
if (width) {
efree(iname);
break;
if (!strcmp("height", type)) {
height = (unsigned int) value;
if (width) {
efree(iname);
break;
}
}
}
}
Expand Down
21 changes: 21 additions & 0 deletions ext/standard/tests/image/xbm_out_of_range.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
--TEST--
getimagesize() rejects out-of-range XBM dimensions
--FILE--
<?php
$path = __DIR__ . '/xbm_out_of_range.tmp.xbm';
foreach ([['4294967298', '1'], ['1', '4294967298'], ['2147483648', '1'], ['-5', '1'], ['2147483647', '1']] as [$w, $h]) {
file_put_contents($path, "#define x_width $w\n#define x_height $h\nstatic char x_bits[] = {\n0x00 };\n");
$info = getimagesize($path);
echo "$w x $h: ", $info ? $info[3] : 'false', "\n";
}
?>
--CLEAN--
<?php
@unlink(__DIR__ . '/xbm_out_of_range.tmp.xbm');
?>
--EXPECT--
4294967298 x 1: false
1 x 4294967298: false
2147483648 x 1: false
-5 x 1: false
2147483647 x 1: width="2147483647" height="1"
Loading