com php-src: Merge branch 'PHP-5.6': ext/standard/image.c
| From: | Anatol Belski | Date: | Fri, 19 Sep 2014 18:15:56 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/standard/image.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81785@lists.php.net to get a copy of this message | ||
Commit: f6c02239caa84b0cf0ed1ce3fecc87cd0008e413
Author: Anatol Belski <ab@php.net> Fri, 19 Sep 2014 20:15:56 +0200
Parents: c343ca4efba7e600f7d20c73fde34dbda8192e48 6213d9fc91de457b08e574a0f1ac8073eb948b17
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f6c02239caa84b0cf0ed1ce3fecc87cd0008e413
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
fix possible array underflow
Conflicts:
ext/standard/image.c
Changed paths:
MM ext/standard/image.c
Diff: