projects
/
m6w6
/
ext-psi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
ffi: fix buffer overrun when padding struct storage
[m6w6/ext-psi]
/
src
/
module.c
diff --git
a/src/module.c
b/src/module.c
index 1db2adff529377b922a848f262fbf71e6a680449..e7948d8a0e9abec32534e7665797fa6109e65fdf 100644
(file)
--- a/
src/module.c
+++ b/
src/module.c
@@
-127,10
+127,17
@@
ZEND_END_ARG_INFO();
static PHP_FUNCTION(psi_validate)
{
zend_string *file;
static PHP_FUNCTION(psi_validate)
{
zend_string *file;
+ struct psi_parser_input *I;
struct psi_parser P;
struct psi_data D = {0};
zend_long flags = 0;
struct psi_parser P;
struct psi_data D = {0};
zend_long flags = 0;
+#if PHP_DEBUG
+ if (psi_check_env("PSI_DEBUG")) {
+ flags |= PSI_DEBUG;
+ }
+#endif
+
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "P|l", &file, &flags)) {
return;
}
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "P|l", &file, &flags)) {
return;
}
@@
-138,17
+145,17
@@
static PHP_FUNCTION(psi_validate)
if (!psi_parser_init(&P, psi_error_wrapper, flags)) {
RETURN_FALSE;
}
if (!psi_parser_init(&P, psi_error_wrapper, flags)) {
RETURN_FALSE;
}
- if (!
psi_parser_open_file(&P, file->val
)) {
+ if (!
(I = psi_parser_open_file(&P, file->val, true)
)) {
psi_parser_dtor(&P);
RETURN_FALSE;
}
psi_parser_dtor(&P);
RETURN_FALSE;
}
- psi_parser_parse(&P);
+ psi_parser_parse(&P
, I
);
psi_data_ctor(&D, P.error, P.flags);
RETVAL_BOOL(psi_data_validate(&D, PSI_DATA(&P)) && !P.errors);
psi_data_dtor(&D);
psi_data_ctor(&D, P.error, P.flags);
RETVAL_BOOL(psi_data_validate(&D, PSI_DATA(&P)) && !P.errors);
psi_data_dtor(&D);
-
psi_parser_dtor(&P);
psi_parser_dtor(&P);
+ free(I);
}
ZEND_BEGIN_ARG_INFO_EX(ai_psi_validate_string, 0, 0, 1)
}
ZEND_BEGIN_ARG_INFO_EX(ai_psi_validate_string, 0, 0, 1)
@@
-157,10
+164,17
@@
ZEND_END_ARG_INFO();
static PHP_FUNCTION(psi_validate_string)
{
zend_string *string;
static PHP_FUNCTION(psi_validate_string)
{
zend_string *string;
+ struct psi_parser_input *I;
struct psi_parser P;
struct psi_data D = {0};
zend_long flags = 0;
struct psi_parser P;
struct psi_data D = {0};
zend_long flags = 0;
+#if PHP_DEBUG
+ if (psi_check_env("PSI_DEBUG")) {
+ flags |= PSI_DEBUG;
+ }
+#endif
+
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S|l", &string, &flags)) {
return;
}
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S|l", &string, &flags)) {
return;
}
@@
-168,17
+182,17
@@
static PHP_FUNCTION(psi_validate_string)
if (!psi_parser_init(&P, psi_error_wrapper, flags)) {
RETURN_FALSE;
}
if (!psi_parser_init(&P, psi_error_wrapper, flags)) {
RETURN_FALSE;
}
- if (!
psi_parser_open_string(&P, string->val, string->len
)) {
+ if (!
(I = psi_parser_open_string(&P, string->val, string->len)
)) {
psi_parser_dtor(&P);
RETURN_FALSE;
}
psi_parser_dtor(&P);
RETURN_FALSE;
}
- psi_parser_parse(&P);
+ psi_parser_parse(&P
, I
);
psi_data_ctor(&D, P.error, P.flags);
RETVAL_BOOL(psi_data_validate(&D, PSI_DATA(&P)) && !P.errors);
psi_data_dtor(&D);
psi_data_ctor(&D, P.error, P.flags);
RETVAL_BOOL(psi_data_validate(&D, PSI_DATA(&P)) && !P.errors);
psi_data_dtor(&D);
-
psi_parser_dtor(&P);
psi_parser_dtor(&P);
+ free(I);
}
static PHP_MINIT_FUNCTION(psi)
}
static PHP_MINIT_FUNCTION(psi)
@@
-225,15
+239,15
@@
static PHP_MINIT_FUNCTION(psi)
PSI_G(context) = psi_context_init(NULL, ops, psi_error_wrapper, flags);
psi_context_build(PSI_G(context), PSI_G(directory));
PSI_G(context) = psi_context_init(NULL, ops, psi_error_wrapper, flags);
psi_context_build(PSI_G(context), PSI_G(directory));
- if (psi_check_env("PSI_DUMP")) {
- psi_context_dump(PSI_G(context), STDOUT_FILENO);
- }
-
return SUCCESS;
}
static PHP_MSHUTDOWN_FUNCTION(psi)
{
return SUCCESS;
}
static PHP_MSHUTDOWN_FUNCTION(psi)
{
+ if (psi_check_env("PSI_DUMP")) {
+ psi_context_dump(PSI_G(context), STDOUT_FILENO);
+ }
+
psi_context_free(&PSI_G(context));
UNREGISTER_INI_ENTRIES();
psi_context_free(&PSI_G(context));
UNREGISTER_INI_ENTRIES();