Skip to content

Commit 612a34c

Browse files
nielsdosnielsdos
committed
Fix bug #79075: FFI header parser chokes on comments
The directives for FFI should be first in the file, which is fine, however sometimes there can be comments or whitespace before or between these defines. One practical example is for license information or when a user adds newlines "by accident". In these cases, it's quite confusing that the directives do not work properly. To solve this, make the zend_ffi_parse_directives() aware of comments. Closes GH-17082.
1 parent b2e5b05 commit 612a34c

File tree

5 files changed

+104
-66
lines changed

5 files changed

+104
-66
lines changed

‎NEWS

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ PHP NEWS
55
- DBA:
66
. Skip test if inifile is disabled. (orlitzky)
77

8+
- FFI:
9+
. Fixed bug #79075 (FFI header parser chokes on comments). (nielsdos)
10+
811
- Iconv:
912
. Fixed bug GH-17047 (UAF on iconv filter failure). (nielsdos)
1013

‎ext/ffi/ffi.c

+61-66
Original file line numberDiff line numberDiff line change
@@ -4958,107 +4958,102 @@ ZEND_METHOD(FFI_CType, getFuncParameterType) /* {{{ */
49584958
}
49594959
/* }}} */
49604960

4961+
static char *zend_ffi_skip_ws_and_comments(char *p, bool allow_standalone_newline)
4962+
{
4963+
while (true) {
4964+
if (*p == ' ' || *p == '\t') {
4965+
p++;
4966+
} else if (allow_standalone_newline && (*p == '\r' || *p == '\n' || *p == '\f' || *p == '\v')) {
4967+
p++;
4968+
} else if (allow_standalone_newline && *p == '/' && p[1] == '/') {
4969+
p += 2;
4970+
while (*p && *p != '\r' && *p != '\n') {
4971+
p++;
4972+
}
4973+
} else if (*p == '/' && p[1] == '*') {
4974+
p += 2;
4975+
while (*p && (*p != '*' || p[1] != '/')) {
4976+
p++;
4977+
}
4978+
if (*p == '*') {
4979+
p++;
4980+
if (*p == '/') {
4981+
p++;
4982+
}
4983+
}
4984+
} else {
4985+
break;
4986+
}
4987+
}
4988+
4989+
return p;
4990+
}
4991+
49614992
static char *zend_ffi_parse_directives(const char *filename, char *code_pos, char **scope_name, char **lib, bool preload) /* {{{ */
49624993
{
49634994
char *p;
49644995

4996+
code_pos = zend_ffi_skip_ws_and_comments(code_pos, true);
4997+
49654998
*scope_name = NULL;
49664999
*lib = NULL;
49675000
while (*code_pos == '#') {
4968-
if (strncmp(code_pos, "#define FFI_SCOPE", sizeof("#define FFI_SCOPE") - 1) == 0
4969-
&& (code_pos[sizeof("#define FFI_SCOPE") - 1] == ' '
4970-
|| code_pos[sizeof("#define FFI_SCOPE") - 1] == '\t')) {
4971-
p = code_pos + sizeof("#define FFI_SCOPE");
4972-
while (*p == ' ' || *p == '\t') {
4973-
p++;
4974-
}
4975-
if (*p != '"') {
4976-
if (preload) {
4977-
zend_error(E_WARNING, "FFI: failed pre-loading '%s', bad FFI_SCOPE define", filename);
4978-
} else {
4979-
zend_throw_error(zend_ffi_exception_ce, "Failed loading '%s', bad FFI_SCOPE define", filename);
4980-
}
4981-
return NULL;
4982-
}
4983-
p++;
4984-
if (*scope_name) {
4985-
if (preload) {
4986-
zend_error(E_WARNING, "FFI: failed pre-loading '%s', FFI_SCOPE defined twice", filename);
4987-
} else {
4988-
zend_throw_error(zend_ffi_exception_ce, "Failed loading '%s', FFI_SCOPE defined twice", filename);
4989-
}
4990-
return NULL;
4991-
}
4992-
*scope_name = p;
4993-
while (1) {
4994-
if (*p == '\"') {
4995-
*p = 0;
5001+
if (strncmp(code_pos, ZEND_STRL("#define")) == 0) {
5002+
p = zend_ffi_skip_ws_and_comments(code_pos + sizeof("#define") - 1, false);
5003+
5004+
char **target = NULL;
5005+
const char *target_name = NULL;
5006+
if (strncmp(p, ZEND_STRL("FFI_SCOPE")) == 0) {
5007+
p = zend_ffi_skip_ws_and_comments(p + sizeof("FFI_SCOPE") - 1, false);
5008+
target = scope_name;
5009+
target_name = "FFI_SCOPE";
5010+
} else if (strncmp(p, ZEND_STRL("FFI_LIB")) == 0) {
5011+
p = zend_ffi_skip_ws_and_comments(p + sizeof("FFI_LIB") - 1, false);
5012+
target = lib;
5013+
target_name = "FFI_LIB";
5014+
} else {
5015+
while (*p && *p != '\n' && *p != '\r') {
49965016
p++;
4997-
break;
4998-
} else if (*p <= ' ') {
4999-
if (preload) {
5000-
zend_error(E_WARNING, "FFI: failed pre-loading '%s', bad FFI_SCOPE define", filename);
5001-
} else {
5002-
zend_throw_error(zend_ffi_exception_ce, "Failed loading '%s', bad FFI_SCOPE define", filename);
5003-
}
5004-
return NULL;
50055017
}
5006-
p++;
5007-
}
5008-
while (*p == ' ' || *p == '\t') {
5009-
p++;
5010-
}
5011-
while (*p == '\r' || *p == '\n') {
5012-
p++;
5013-
}
5014-
code_pos = p;
5015-
} else if (strncmp(code_pos, "#define FFI_LIB", sizeof("#define FFI_LIB") - 1) == 0
5016-
&& (code_pos[sizeof("#define FFI_LIB") - 1] == ' '
5017-
|| code_pos[sizeof("#define FFI_LIB") - 1] == '\t')) {
5018-
p = code_pos + sizeof("#define FFI_LIB");
5019-
while (*p == ' ' || *p == '\t') {
5020-
p++;
5018+
code_pos = zend_ffi_skip_ws_and_comments(p, true);
5019+
continue;
50215020
}
5021+
50225022
if (*p != '"') {
50235023
if (preload) {
5024-
zend_error(E_WARNING, "FFI: failed pre-loading '%s', bad FFI_LIB define", filename);
5024+
zend_error(E_WARNING, "FFI: failed pre-loading '%s', bad %s define", filename, target_name);
50255025
} else {
5026-
zend_throw_error(zend_ffi_exception_ce, "Failed loading '%s', bad FFI_LIB define", filename);
5026+
zend_throw_error(zend_ffi_exception_ce, "Failed loading '%s', bad %s define", filename, target_name);
50275027
}
50285028
return NULL;
50295029
}
50305030
p++;
5031-
if (*lib) {
5031+
if (*target) {
50325032
if (preload) {
5033-
zend_error(E_WARNING, "FFI: failed pre-loading '%s', FFI_LIB defined twice", filename);
5033+
zend_error(E_WARNING, "FFI: failed pre-loading '%s', %s defined twice", filename, target_name);
50345034
} else {
5035-
zend_throw_error(zend_ffi_exception_ce, "Failed loading '%s', FFI_LIB defined twice", filename);
5035+
zend_throw_error(zend_ffi_exception_ce, "Failed loading '%s', %s defined twice", filename, target_name);
50365036
}
50375037
return NULL;
50385038
}
5039-
*lib = p;
5039+
*target = p;
50405040
while (1) {
50415041
if (*p == '\"') {
50425042
*p = 0;
50435043
p++;
50445044
break;
50455045
} else if (*p <= ' ') {
50465046
if (preload) {
5047-
zend_error(E_WARNING, "FFI: failed pre-loading '%s', bad FFI_LIB define", filename);
5047+
zend_error(E_WARNING, "FFI: failed pre-loading '%s', bad %s define", filename, target_name);
50485048
} else {
5049-
zend_throw_error(zend_ffi_exception_ce, "Failed loading '%s', bad FFI_LIB define", filename);
5049+
zend_throw_error(zend_ffi_exception_ce, "Failed loading '%s', bad %s define", filename, target_name);
50505050
}
50515051
return NULL;
50525052
}
50535053
p++;
50545054
}
5055-
while (*p == ' ' || *p == '\t') {
5056-
p++;
5057-
}
5058-
while (*p == '\r' || *p == '\n') {
5059-
p++;
5060-
}
5061-
code_pos = p;
5055+
5056+
code_pos = zend_ffi_skip_ws_and_comments(p, true);
50625057
} else {
50635058
break;
50645059
}

‎ext/ffi/tests/bug79075.h

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/*
2+
* Multiline comment
3+
*/
4+
// whitespace line
5+
6+
#define ignore_this_line 1
7+
//
8+
#define/* inline */FFI_SCOPE /* multi-
9+
line */ "bug79075" /* end
10+
*/
11+
12+
int printf(const char *format, ...);

‎ext/ffi/tests/bug79075.inc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<?php
2+
3+
FFI::load(__DIR__ . "/bug79075.h");

‎ext/ffi/tests/bug79075.phpt

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
--TEST--
2+
Bug #79075 (FFI header parser chokes on comments)
3+
--EXTENSIONS--
4+
ffi
5+
opcache
6+
posix
7+
--SKIPIF--
8+
<?php
9+
if (substr(PHP_OS, 0, 3) == 'WIN') die('skip not for Windows');
10+
if (posix_geteuid() == 0) die('skip Cannot run test as root.');
11+
?>
12+
--INI--
13+
ffi.enable=1
14+
opcache.enable=1
15+
opcache.enable_cli=1
16+
opcache.optimization_level=-1
17+
opcache.preload={PWD}/bug79075.inc
18+
opcache.file_cache_only=0
19+
--FILE--
20+
<?php
21+
$ffi = FFI::scope("bug79075");
22+
$ffi->printf("Hello World from %s!\n", "PHP");
23+
?>
24+
--EXPECT--
25+
Hello World from PHP!

0 commit comments

Comments
 (0)