php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-10 17:43:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0

Browse Source 
* 'PHP-7.0' of git.php.net:/php-src:
  Fixed bug #67707 IV not needed for ECB encryption mode, but it returns a warning
  Fixed #73907 (nextSibling property not included in var_dump of DOMNode)
  Fixed bug #61858 (DOMAttr debug info generates E_WARNING)
  Fix glob-wrapper.phpt to not fail in Windows
  Fix #73893: A hidden danger of death cycle in a function of gd
This commit is contained in:
Joe Watkins
2017-01-11 08:12:51 +00:00
parent 51d487786c d9cd2876d9
commit b2782c6dc5
12 changed files with 76 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/dom/attr.c
View File

@@ -213,7 +213,7 @@ Since: DOM Level 3
*/
int dom_attr_schema_type_info_read(dom_object *obj, zval *retval)
{
php_error_docref(NULL, E_WARNING, "Not yet implemented");
/* TODO */
ZVAL_NULL(retval);
return SUCCESS;
}

3
ext/dom/node.c
View File

@@ -549,7 +549,8 @@ int dom_node_next_sibling_read(dom_object *obj, zval *retval)
nextsib = nodep->next;
if (!nextsib) {
return FAILURE;
ZVAL_NULL(retval);
return SUCCESS;
}
php_dom_create_object(nextsib, retval, obj);

24
ext/dom/tests/bug61858.phpt Normal file
View File

@@ -0,0 +1,24 @@
--TEST--
Bug #61858 DOMAttr debug info generates E_WARNING
--SKIPIF--
<?php
require_once('skipif.inc');
?>
--FILE--
<?php
$doc = new DOMDocument();
$doc->loadXML('<example a="b">Test</example>');
$example = $doc->getElementsByTagName('example')->item(0);
$attr = $example->getAttributeNode('a');
var_dump($attr);
print_r($attr);
--EXPECTF--
object(DOMAttr)#%d (%d) {
%A
}
DOMAttr Object
(
%A
)

12
ext/dom/tests/bug69846.phpt
View File

@@ -31,7 +31,7 @@ foreach ($dataNodes AS $node) {
===DONE===
--EXPECTF--
int(3)
object(DOMText)#%d (18) {
object(DOMText)#%d (19) {
["wholeText"]=>
string(3) "
"
@@ -57,6 +57,8 @@ object(DOMText)#%d (18) {
NULL
["previousSibling"]=>
NULL
["nextSibling"]=>
NULL
["attributes"]=>
NULL
["ownerDocument"]=>
@@ -73,7 +75,7 @@ object(DOMText)#%d (18) {
string(3) "
"
}
object(DOMElement)#%d (17) {
object(DOMElement)#%d (18) {
["tagName"]=>
string(5) "form1"
["schemaTypeInfo"]=>
@@ -98,6 +100,8 @@ object(DOMElement)#%d (17) {
string(22) "(object value omitted)"
["previousSibling"]=>
NULL
["nextSibling"]=>
NULL
["attributes"]=>
string(22) "(object value omitted)"
["ownerDocument"]=>
@@ -117,7 +121,7 @@ object(DOMElement)#%d (17) {
Value C
"
}
object(DOMText)#%d (18) {
object(DOMText)#%d (19) {
["wholeText"]=>
string(1) "
"
@@ -143,6 +147,8 @@ object(DOMText)#%d (18) {
NULL
["previousSibling"]=>
NULL
["nextSibling"]=>
NULL
["attributes"]=>
NULL
["ownerDocument"]=>

20
ext/dom/tests/bug73907.phpt Normal file
View File

@@ -0,0 +1,20 @@
--TEST--
Bug #73907 nextSibling property not included in var_dump of DOMNode
--SKIPIF--
<?php require_once('skipif.inc'); ?>
--FILE--
<?php
$xmlString = '<?xml version="1.0" encoding="utf-8" ?>
<root>
</root>';
$doc = new DOMDocument();
$doc->loadXML($xmlString);
$attr = $doc->documentElement;
var_dump($attr);
--EXPECTF--
object(DOMElement)#%d (%d) {%A
["nextSibling"]=>
NULL
%A}

4
ext/dom/tests/dom_set_attr_node.phpt
View File

@@ -61,9 +61,7 @@ object(DOMException)#%d (7) {
["args"]=>
array(1) {
[0]=>
Warning: var_dump(): %s
DOMAttr
DOMAttr
}
}
}

1
ext/dom/tests/domobject_debug_handler.phpt
View File

@@ -47,6 +47,7 @@ DOMDocument Object
[firstChild] => (object value omitted)
[lastChild] => (object value omitted)
[previousSibling] =>
[nextSibling] =>
[attributes] =>
[ownerDocument] =>
[namespaceURI] =>

2
ext/gd/libgd/gd.h
View File

@@ -693,8 +693,6 @@ void gdImageCopyResampled(gdImagePtr dst, gdImagePtr src, int dstX, int dstY, in
gdImagePtr gdImageRotate90(gdImagePtr src, int ignoretransparent);
gdImagePtr gdImageRotate180(gdImagePtr src, int ignoretransparent);
gdImagePtr gdImageRotate270(gdImagePtr src, int ignoretransparent);
gdImagePtr gdImageRotate45(gdImagePtr src, double dAngle, int clrBack, int ignoretransparent);
gdImagePtr gdImageRotate (gdImagePtr src, double dAngle, int clrBack, int ignoretransparent);
gdImagePtr gdImageRotateInterpolated(const gdImagePtr src, const float angle, int bgcolor);
void gdImageSetBrush(gdImagePtr im, gdImagePtr brush);

215
ext/gd/libgd/gd_rotate.c
View File

@@ -343,218 +343,3 @@ gdImagePtr gdImageRotate270 (gdImagePtr src, int ignoretransparent)
return dst;
}
gdImagePtr gdImageRotate45 (gdImagePtr src, double dAngle, int clrBack, int ignoretransparent)
{
typedef int (*FuncPtr)(gdImagePtr, int, int);
gdImagePtr dst1,dst2,dst3;
FuncPtr f;
double dRadAngle, dSinE, dTan, dShear;
double dOffset; /* Variable skew offset */
int u, iShear, newx, newy;
int clrBackR, clrBackG, clrBackB, clrBackA;
/* See GEMS I for the algorithm details */
dRadAngle = dAngle * ROTATE_DEG2RAD; /* Angle in radians */
dSinE = sin (dRadAngle);
dTan = tan (dRadAngle / 2.0);
newx = (int)(src->sx + src->sy * fabs(dTan));
newy = src->sy;
/* 1st shear */
if (src->trueColor) {
f = gdImageGetTrueColorPixel;
} else {
f = gdImageGetPixel;
}
dst1 = gdImageCreateTrueColor(newx, newy);
/******* Perform 1st shear (horizontal) ******/
if (dst1 == NULL) {
return NULL;
}
#ifdef HAVE_GD_BUNDLED
dst1->alphaBlendingFlag = gdEffectReplace;
#else
gdImageAlphaBlending(dst1, 0);
#endif
if (dAngle == 0.0) {
/* Returns copy of src */
gdImageCopy (dst1, src,0,0,0,0,src->sx,src->sy);
return dst1;
}
gdImagePaletteCopy (dst1, src);
if (ignoretransparent) {
if (gdImageTrueColor(src)) {
dst1->transparent = src->transparent;
} else {
dst1->transparent = gdTrueColorAlpha(gdImageRed(src, src->transparent), gdImageBlue(src, src->transparent), gdImageGreen(src, src->transparent), 127);
}
}
dRadAngle = dAngle * ROTATE_DEG2RAD; /* Angle in radians */
dSinE = sin (dRadAngle);
dTan = tan (dRadAngle / 2.0);
for (u = 0; u < dst1->sy; u++) {
if (dTan >= 0.0) {
dShear = ((double)(u + 0.5)) * dTan;
} else {
dShear = ((double)(u - dst1->sy) + 0.5) * dTan;
}
iShear = (int)floor(dShear);
gdImageSkewX(dst1, src, u, iShear, (dShear - iShear), clrBack, ignoretransparent);
}
/*
The 1st shear may use the original clrBack as color index
Convert it once here
*/
if(!src->trueColor) {
clrBackR = gdImageRed(src, clrBack);
clrBackG = gdImageGreen(src, clrBack);
clrBackB = gdImageBlue(src, clrBack);
clrBackA = gdImageAlpha(src, clrBack);
clrBack = gdTrueColorAlpha(clrBackR, clrBackG, clrBackB, clrBackA);
}
/* 2nd shear */
newx = dst1->sx;
if (dSinE > 0.0) {
dOffset = (src->sx-1) * dSinE;
} else {
dOffset = -dSinE * (src->sx - newx);
}
newy = (int) ((double) src->sx * fabs( dSinE ) + (double) src->sy * cos (dRadAngle))+1;
if (src->trueColor) {
f = gdImageGetTrueColorPixel;
} else {
f = gdImageGetPixel;
}
dst2 = gdImageCreateTrueColor(newx, newy);
if (dst2 == NULL) {
gdImageDestroy(dst1);
return NULL;
}
#ifdef HAVE_GD_BUNDLED
dst2->alphaBlendingFlag = gdEffectReplace;
#else
gdImageAlphaBlending(dst2, 0);
#endif
if (ignoretransparent) {
dst2->transparent = dst1->transparent;
}
for (u = 0; u < dst2->sx; u++, dOffset -= dSinE) {
iShear = (int)floor (dOffset);
gdImageSkewY(dst2, dst1, u, iShear, (dOffset - (double)iShear), clrBack, ignoretransparent);
}
/* 3rd shear */
gdImageDestroy(dst1);
newx = (int) ((double)src->sy * fabs (dSinE) + (double)src->sx * cos (dRadAngle)) + 1;
newy = dst2->sy;
if (src->trueColor) {
f = gdImageGetTrueColorPixel;
} else {
f = gdImageGetPixel;
}
dst3 = gdImageCreateTrueColor(newx, newy);
if (dst3 == NULL) {
gdImageDestroy(dst2);
return NULL;
}
#ifdef HAVE_GD_BUNDLED
dst3->alphaBlendingFlag = gdEffectReplace;
#else
gdImageAlphaBlending(dst3, 0);
#endif
if (ignoretransparent) {
dst3->transparent = dst2->transparent;
}
if (dSinE >= 0.0) {
dOffset = (double)(src->sx - 1) * dSinE * -dTan;
} else {
dOffset = dTan * ((double)(src->sx - 1) * -dSinE + (double)(1 - newy));
}
for (u = 0; u < dst3->sy; u++, dOffset += dTan) {
int iShear = (int)floor(dOffset);
gdImageSkewX(dst3, dst2, u, iShear, (dOffset - iShear), clrBack, ignoretransparent);
}
gdImageDestroy(dst2);
return dst3;
}
gdImagePtr gdImageRotate (gdImagePtr src, double dAngle, int clrBack, int ignoretransparent)
{
gdImagePtr pMidImg;
gdImagePtr rotatedImg;
if (src == NULL) {
return NULL;
}
if (!gdImageTrueColor(src) && (clrBack < 0 || clrBack>=gdImageColorsTotal(src))) {
return NULL;
}
while (dAngle >= 360.0) {
dAngle -= 360.0;
}
while (dAngle < 0) {
dAngle += 360.0;
}
if (dAngle == 90.00) {
return gdImageRotate90(src, ignoretransparent);
}
if (dAngle == 180.00) {
return gdImageRotate180(src, ignoretransparent);
}
if(dAngle == 270.00) {
return gdImageRotate270 (src, ignoretransparent);
}
if ((dAngle > 45.0) && (dAngle <= 135.0)) {
pMidImg = gdImageRotate90 (src, ignoretransparent);
dAngle -= 90.0;
} else if ((dAngle > 135.0) && (dAngle <= 225.0)) {
pMidImg = gdImageRotate180 (src, ignoretransparent);
dAngle -= 180.0;
} else if ((dAngle > 225.0) && (dAngle <= 315.0)) {
pMidImg = gdImageRotate270 (src, ignoretransparent);
dAngle -= 270.0;
} else {
return gdImageRotate45 (src, dAngle, clrBack, ignoretransparent);
}
if (pMidImg == NULL) {
return NULL;
}
rotatedImg = gdImageRotate45 (pMidImg, dAngle, clrBack, ignoretransparent);
gdImageDestroy(pMidImg);
return rotatedImg;
}
/* End Rotate function */

4
ext/mcrypt/mcrypt.c
View File

@@ -572,7 +572,9 @@ PHP_FUNCTION(mcrypt_generic_init)
memcpy(key_s, key, key_len);
if (iv_len != iv_size) {
php_error_docref(NULL, E_WARNING, "Iv size incorrect; supplied length: %zd, needed: %d", iv_len, iv_size);
if (mcrypt_enc_mode_has_iv(pm->td)) {
php_error_docref(NULL, E_WARNING, "Iv size incorrect; supplied length: %zd, needed: %d", iv_len, iv_size);
}
if (iv_len > iv_size) {
iv_len = iv_size;
}

10
ext/mcrypt/tests/bug67707.phpt Normal file
View File

@@ -0,0 +1,10 @@
--TEST--
Bug #67707 IV not needed for ECB encryption mode, but it returns a warning
--SKIPIF--
<?php if (!extension_loaded("mcrypt")) print "skip"; ?>
--FILE--
<?php
$td = mcrypt_module_open('rijndael-256', '', 'ecb', '');
mcrypt_generic_init($td, 'secret key', NULL);
?>
--EXPECTF--

10
ext/standard/tests/streams/glob-wrapper.phpt
View File

@@ -23,13 +23,13 @@ foreach ( [ __DIR__, "glob://".__DIR__ ] as $spec) {
--EXPECTF--
** Opening %s
Warning: opendir(): open_basedir restriction in effect. File(/%s) is not within the allowed path(s): (/does_not_exist) in %s/glob-wrapper.php on line 5
Warning: opendir(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (/does_not_exist) in %s%eglob-wrapper.php on line 5
Warning: opendir(/%s): failed to open dir: Operation not permitted in %s/glob-wrapper.php on line 5
Failed to open /%s
Warning: opendir(%s): failed to open dir: Operation not permitted in %s%eglob-wrapper.php on line 5
Failed to open %s
** Opening glob://%s
Warning: opendir(): open_basedir restriction in effect. File(/%s) is not within the allowed path(s): (/does_not_exist) in %s/glob-wrapper.php on line 5
Warning: opendir(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (/does_not_exist) in %s%eglob-wrapper.php on line 5
Warning: opendir(glob://%s): failed to open dir: operation failed in %s/glob-wrapper.php on line 5
Warning: opendir(glob://%s): failed to open dir: operation failed in %s%eglob-wrapper.php on line 5
Failed to open glob://%s