mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

php: Fix segfault when function has an OStringList optional argument.

Browse Source 
How this PHP/Zend stuff is supposed to work is not documented, but at
least with these changes it no longer segfaults.
This commit is contained in:
Richard W.M. Jones
2013-04-04 11:49:27 +01:00
parent ba0199c487
commit 289fd29f0b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
generator/php.ml
View File

@@ -223,7 +223,7 @@ PHP_FUNCTION (guestfs_last_error)
pr " char *optargs_t_%s = NULL;\n" n;
pr " int optargs_t_%s_size = -1;\n" n
| OStringList n ->
pr " zval *z_%s;\n" n
pr " zval *optargs_t_%s;\n" n
) optargs
);
@@ -281,7 +281,7 @@ PHP_FUNCTION (guestfs_last_error)
| OString n ->
pr ", &optargs_t_%s, &optargs_t_%s_size" n n
| OStringList n ->
pr ", &z_%s" n
pr ", &optargs_t_%s" n
) optargs;
pr ") == FAILURE) {\n";
pr " RETURN_FALSE;\n";
@@ -363,7 +363,7 @@ PHP_FUNCTION (guestfs_last_error)
pr " }\n"
| OStringList n ->
let uc_n = String.uppercase n in
pr " if (z_%s != NULL) {\n" n;
pr " if (optargs_t_%s != NULL && ! ZVAL_IS_NULL (optargs_t_%s)) {\n" n n;
pr " char **r;\n";
pr " HashTable *a;\n";
pr " int n;\n";
@@ -371,7 +371,7 @@ PHP_FUNCTION (guestfs_last_error)
pr " zval **d;\n";
pr " size_t c = 0;\n";
pr "\n";
pr " a = Z_ARRVAL_P (z_%s);\n" n;
pr " a = Z_ARRVAL_P (optargs_t_%s);\n" n;
pr " n = zend_hash_num_elements (a);\n";
pr " r = safe_emalloc (n + 1, sizeof (char *), 0);\n";
pr " for (zend_hash_internal_pointer_reset_ex (a, &p);\n";
@@ -384,8 +384,8 @@ PHP_FUNCTION (guestfs_last_error)
pr " c++;\n";
pr " }\n";
pr " r[c] = NULL;\n";
pr " optargs_s.%s = r;\n" n;
pr "\n";
pr " optargs_s.%s = r;\n" n;
pr " optargs_s.bitmask |= %s_%s_BITMASK;\n" c_optarg_prefix uc_n;
pr " }\n";
) optargs;