php-win-ext/pecl-processing-rrd
1
0
Fork 0
mirror of https://github.com/php-win-ext/pecl-processing-rrd.git synced 2026-03-24 00:52:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

security fix, check for NUL char in path

Browse Source 
git-svn-id: http://svn.php.net/repository/pecl/rrd/trunk@336993 c90b9560-bf6c-de11-be94-00142212c4b1
This commit is contained in:
Remi Collet
2015-06-17 12:28:51 +00:00
parent eaf8dd49b5
commit da01cdb161
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rrd.c
View File

@@ -60,7 +60,7 @@ PHP_FUNCTION(rrd_fetch)
char **ds_namv; /* list of data source names */
rrd_value_t *ds_data; /* all data from all sources */
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sa", &filename,
if (zend_parse_parameters(ZEND_NUM_ARGS(), "pa", &filename,
&filename_length, &zv_arr_options) == FAILURE) {
return;
}
@@ -155,7 +155,7 @@ PHP_FUNCTION(rrd_first)
/* return value from rrd_first_r call */
time_t rrd_first_return_val;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|l", &filename,
if (zend_parse_parameters(ZEND_NUM_ARGS(), "p|l", &filename,
&filename_length, &rraindex) == FAILURE) {
return;
}
@@ -190,7 +190,7 @@ PHP_FUNCTION(rrd_last)
/* return value from rrd_first_r call */
time_t rrd_last_return_val;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &filename,
if (zend_parse_parameters(ZEND_NUM_ARGS(), "p", &filename,
&filename_length) == FAILURE) {
return;
}
@@ -226,7 +226,7 @@ PHP_FUNCTION(rrd_lastupdate)
char **ds_namv;
char **last_ds;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &filename,
if (zend_parse_parameters(ZEND_NUM_ARGS(), "p", &filename,
&filename_length) == FAILURE) {
return;
}
@@ -309,7 +309,7 @@ PHP_FUNCTION(rrd_restore)
zval zv_options;
rrd_args *argv;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|a", &xml_filename,
if (zend_parse_parameters(ZEND_NUM_ARGS(), "pp|a", &xml_filename,
&xml_filename_length, &rrd_filename, &rrd_filename_length,
&zv_arr_options) == FAILURE) {
return;
@@ -356,7 +356,7 @@ PHP_FUNCTION(rrd_tune)
zval *zv_arr_options;
rrd_args *argv;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sa", &filename,
if (zend_parse_parameters(ZEND_NUM_ARGS(), "pa", &filename,
&filename_length, &zv_arr_options) == FAILURE) {
return;
}

4
rrd_create.c
View File

@@ -108,7 +108,7 @@ PHP_METHOD(RRDCreator, __construct)
long step = 0;
int argc = ZEND_NUM_ARGS();
if (zend_parse_parameters(argc, "s|sl", &path, &path_length,
if (zend_parse_parameters(argc, "p|sl", &path, &path_length,
&start_time, &start_time_length, &step) == FAILURE) {
return;
}
@@ -288,7 +288,7 @@ PHP_FUNCTION(rrd_create)
zval *zv_arr_options;
rrd_args *argv;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sa", &filename,
if (zend_parse_parameters(ZEND_NUM_ARGS(), "pa", &filename,
&filename_length, &zv_arr_options) == FAILURE) {
return;
}

4
rrd_graph.c
View File

@@ -91,7 +91,7 @@ PHP_METHOD(RRDGraph, __construct)
char *path;
size_t path_length;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &path, &path_length) == FAILURE) {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "p", &path, &path_length) == FAILURE) {
return;
}
@@ -302,7 +302,7 @@ PHP_FUNCTION(rrd_graph)
double ymin,ymax;
char **calcpr;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sa", &filename,
if (zend_parse_parameters(ZEND_NUM_ARGS(), "pa", &filename,
&filename_length, &zv_arr_options) == FAILURE) {
return;
}

2
rrd_info.c
View File

@@ -33,7 +33,7 @@ PHP_FUNCTION(rrd_info)
/* return value from rrd_info_r() */
rrd_info_t *rrd_info_data;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &filename,
if (zend_parse_parameters(ZEND_NUM_ARGS(), "p", &filename,
&filename_length) == FAILURE) {
return;
}

4
rrd_update.c
View File

@@ -85,7 +85,7 @@ PHP_METHOD(RRDUpdater, __construct)
char *path;
size_t path_length;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &path, &path_length) == FAILURE) {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "p", &path, &path_length) == FAILURE) {
return;
}
@@ -219,7 +219,7 @@ PHP_FUNCTION(rrd_update)
zval *zv_arr_options;
rrd_args *argv;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sa", &filename,
if (zend_parse_parameters(ZEND_NUM_ARGS(), "pa", &filename,
&filename_length, &zv_arr_options) == FAILURE) {
return;
}