com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: ext/gd/gd .c ext/hash/hash.c ext/session/session.c
| From: | Anatol Belski | Date: | Thu, 13 Mar 2014 07:38:58 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: ext/gd/gd .c ext/hash/hash.c ext/session/session.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76478@lists.php.net to get a copy of this message | ||
Commit: 3fdbb0d39f8c2b07193ff4c610f33994254772b9
Author: Anatol Belski <ab@php.net> Thu, 13 Mar 2014 08:38:58 +0100
Parents: 63d06ce9b025817142470b5910d42f745b7b852c 973f379efcb43887a83317482c7916004d1a2506
Branches: str_size_and_int64_56_backport
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3fdbb0d39f8c2b07193ff4c610f33994254772b9
Log:
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
Remove unneeded test
Update NEWS
Revert "Implement Bug #54649 Create session_serializer_name()"
Revert "Implemented Request #11100 (session_gc() function)."
made libgd recognize the 9 version series
fix include search
NEWS
NEWS
Fix bug #66887 imagescale - poor quality of scaled image
NEWS
Fixed Bug #66893i imagescale ignore method argument
Add SKIPIF in GMP test
Fix hash_pbkdf2() with missing $length argument
typo in NEWS
typo in NEWS
NEWS
NEWS
Fixed Bug #66890 imagescale segfault
Updated UPGRADING to cover PDO_pgsql changes
Conflicts:
ext/gd/gd.c
ext/hash/hash.c
ext/session/session.c
Bugs:
https://bugs.php.net/54649
https://bugs.php.net/11100
https://bugs.php.net/66887
https://bugs.php.net/66893
https://bugs.php.net/66890
Changed paths:
MM ext/gd/gd.c
MM ext/hash/hash.c
MM ext/session/session.c
Diff:
diff --cc ext/gd/gd.c
index 4d22835,f54fb9f..4d9fa99
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@@ -5117,40 -5109,24 +5117,24 @@@ PHP_FUNCTION(imagescale
{
zval *IM;
gdImagePtr im;
- gdImagePtr im_scaled;
- php_int_t new_width, new_height = -1;
- gdInterpolationMethod method = GD_BILINEAR_FIXED;
+ gdImagePtr im_scaled = NULL;
+ int new_width, new_height;
- long tmp_w, tmp_h=-1, tmp_m = GD_BILINEAR_FIXED;
++ php_int_t tmp_w, tmp_h=-1, tmp_m = GD_BILINEAR_FIXED;
+ gdInterpolationMethod method;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ri|ii", &IM, &new_width,
&new_height, &method) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|ll", &IM, &tmp_w,
&tmp_h, &tmp_m) == FAILURE) {
return;
}
+ method = tmp_m;
+ new_width = tmp_w;
+ new_height = tmp_h;
ZEND_FETCH_RESOURCE(im, gdImagePtr, &IM, -1, "Image", le_gd);
- im_scaled = gdImageScale(im, new_width, new_height);
- goto finish;
- switch (method) {
- case GD_NEAREST_NEIGHBOUR:
- im_scaled = gdImageScaleNearestNeighbour(im, new_width, new_height);
- break;
-
- case GD_BILINEAR_FIXED:
- im_scaled = gdImageScaleBilinear(im, new_width, new_height);
- break;
-
- case GD_BICUBIC:
- im_scaled = gdImageScaleBicubicFixed(im, new_width, new_height);
- break;
-
- case GD_BICUBIC_FIXED:
- im_scaled = gdImageScaleBicubicFixed(im, new_width, new_height);
- break;
-
- default:
- im_scaled = gdImageScaleTwoPass(im, im->sx, im->sy, new_width, new_height);
- break;
+ if (gdImageSetInterpolationMethod(im, method)) {
+ im_scaled = gdImageScale(im, new_width, new_height);
}
- finish:
+
if (im_scaled == NULL) {
RETURN_FALSE;
} else {
diff --cc ext/hash/hash.c
index e034f3b,41c7a70..087015f
--- a/ext/hash/hash.c
+++ b/ext/hash/hash.c
@@@ -611,12 -609,10 +611,10 @@@ Generate a PBKDF2 hash of the given pas
Returns lowercase hexits by default */
PHP_FUNCTION(hash_pbkdf2)
{
- char *returnval, *algo, *salt, *pass;
- unsigned char *computed_salt, *digest, *temp, *result, *K1, *K2;
- long loops, i, j, iterations, length = 0, digest_length;
- int algo_len, pass_len, salt_len;
+ char *returnval, *algo, *salt, *pass = NULL;
+ unsigned char *computed_salt, *digest, *temp, *result, *K1, *K2 = NULL;
- php_int_t loops, i, j, iterations, length;
- php_size_t algo_len, pass_len, digest_length = 0;
- int argc;
- php_size_t salt_len = 0;
++ php_int_t loops, i, j, iterations, length = 0, digest_length = 0;
++ php_size_t algo_len, pass_len, salt_len = 0;
zend_bool raw_output = 0;
const php_hash_ops *ops;
void *context;