summaryrefslogtreecommitdiff
path: root/ext/standard/pack.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/standard/pack.c')
-rw-r--r--ext/standard/pack.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/ext/standard/pack.c b/ext/standard/pack.c
index 5f375585d4..3c0dc009f1 100644
--- a/ext/standard/pack.c
+++ b/ext/standard/pack.c
@@ -297,7 +297,12 @@ PHP_FUNCTION(pack)
}
if (arg < 0) {
- convert_to_string(&argv[currentarg]);
+ if (!try_convert_to_string(&argv[currentarg])) {
+ efree(formatcodes);
+ efree(formatargs);
+ return;
+ }
+
arg = Z_STRLEN(argv[currentarg]);
if (code == 'Z') {
/* add one because Z is always NUL-terminated: