Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src: ensure that the defined interpolation method is used by the generic scaling functions Fixed issue #128 (opcache_invalidate segmentation fault) 5.5.5 now
php · Sep 9, 2013 · 3ce8b70 · 3ce8b70
2 parents 43289d6 + d321941
commit 3ce8b70
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/ext/gd/libgd/gd_interpolation.c b/ext/gd/libgd/gd_interpolation.c
@@ -1063,13 +1063,15 @@ gdImagePtr gdImageScaleTwoPass(const gdImagePtr src, const unsigned int src_widt
 	if (tmp_im == NULL) {
 		return NULL;
 	}
+	gdImageSetInterpolationMethod(tmp_im, src->interpolation_id);
 	_gdScaleHoriz(src, src_width, src_height, tmp_im, new_width, src_height);
 
 	dst = gdImageCreateTrueColor(new_width, new_height);
 	if (dst == NULL) {
 		gdFree(tmp_im);
 		return NULL;
 	}
+	gdImageSetInterpolationMethod(dst, src->interpolation_id);
 	_gdScaleVert(tmp_im, new_width, src_height, dst, new_width, new_height);
 	gdFree(tmp_im);
 
@@ -1084,8 +1086,9 @@ gdImagePtr Scale(const gdImagePtr src, const unsigned int src_width, const unsig
 	if (tmp_im == NULL) {
 		return NULL;
 	}
-	_gdScaleHoriz(src, src_width, src_height, tmp_im, new_width, src_height);
+	gdImageSetInterpolationMethod(tmp_im, src->interpolation_id);
 
+	_gdScaleHoriz(src, src_width, src_height, tmp_im, new_width, src_height);
 	_gdScaleVert(tmp_im, new_width, src_height, dst, new_width, new_height);
 
 	gdFree(tmp_im);

diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -1062,6 +1062,10 @@ int zend_accel_invalidate(const char *filename, int filename_len, zend_bool forc
 	realpath = accelerator_orig_zend_resolve_path(filename, filename_len TSRMLS_CC);
 #endif
 
+	if (!realpath) {
+		return FAILURE;
+	}
+
 	persistent_script = zend_accel_hash_find(&ZCSG(hash), realpath, strlen(realpath) + 1);
 	if (persistent_script && !persistent_script->corrupted) {
 		zend_file_handle file_handle;