summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2015-05-13 11:44:55 +0200
committerJulien Pauli <jpauli@php.net>2015-05-13 11:44:55 +0200
commit658b9b0ab26eedb3e13a583d1585f502e7da728f (patch)
tree17ce02781b16ed7c767ab48f7cb18df1d4ae986f
parentb4161815990a1f2dec8b7ca8c131deadcf32f30c (diff)
downloadphp-git-658b9b0ab26eedb3e13a583d1585f502e7da728f.tar.gz
Backport of Fix bug #69522 - do not allow int overflow
-rw-r--r--ext/standard/pack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/pack.c b/ext/standard/pack.c
index 9d362eb69a..fc3df64007 100644
--- a/ext/standard/pack.c
+++ b/ext/standard/pack.c
@@ -759,7 +759,7 @@ PHP_FUNCTION(unpack)
len = size * 2;
}
- if (argb > 0) {
+ if (len > 0 && argb > 0) {
len -= argb % 2;
}