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

* 'master' of https://git.php.net/push/php-src: (6215 commits)
  Extra comma
  Moved proxy object support in ASSIGN_ADD (and family) from VM to slow paths of corresponding operators
  Simplification
  zend_get_property_info_quick() cleanup and optimization
  initialize lineno before calling compile file file in phar
  Use ADDREF instead of DUP, it must be enough.
  Removed old irrelevant comment
  fixed compilation error
  Fix bug #68262: Broken reference across cloned objects
  export functions needed for phpdbg
  Fixed compilation
  Optimized property access handlers. Removed EG(std_property_info).
  Fixed bug #68199 (PDO::pgsqlGetNotify doesn't support NOTIFY payloads)
  Don't make difference between undefined and unaccessible properies when call __get() and family
  Don't make useless CSE
  array_pop/array_shift optimization
  check for zlib headers as well as lib for mysqlnd
  a realpath cache key can be int or float, catching this
  News entry for new curl constants
  News entry for new curl constants
  ...

1 files changed, 30 insertions, 28 deletions

diff --git a/ext/bcmath/libbcmath/src/num2str.c b/ext/bcmath/libbcmath/src/num2str.c
index 14c57726fe..e38bf87797 100644
--- a/ext/bcmath/libbcmath/src/num2str.c
+++ b/ext/bcmath/libbcmath/src/num2str.c
@@ -40,40 +40,42 @@
 
 /* Convert a numbers to a string.  Base 10 only.*/
 
-char
+zend_string
 *bc_num2str (num)
       bc_num num;
 {
-  char *str, *sptr;
-  char *nptr;
-  int  index, signch;
+	zend_string *str;
+	char *sptr;
+	char *nptr;
+	int  index, signch;
 
-  /* Allocate the string memory. */
-  signch = ( num->n_sign == PLUS ? 0 : 1 );  /* Number of sign chars. */
-  if (num->n_scale > 0)
-    str = (char *) safe_emalloc (1, num->n_len + num->n_scale, 2 + signch);
-  else
-    str = (char *) safe_emalloc (1, num->n_len, 1 + signch);
-  if (str == NULL) bc_out_of_memory();
+	/* Allocate the string memory. */
+	signch = ( num->n_sign == PLUS ? 0 : 1 );  /* Number of sign chars. */
+	if (num->n_scale > 0)
+		str = zend_string_alloc(num->n_len + num->n_scale + signch + 1, 0);
+	else
+		str = zend_string_alloc(num->n_len + signch, 0);
+	if (str == NULL) bc_out_of_memory();
 
-  /* The negative sign if needed. */
-  sptr = str;
-  if (signch) *sptr++ = '-';
+	/* The negative sign if needed. */
+	sptr = str->val;
+	if (signch) *sptr++ = '-';
 
-  /* Load the whole number. */
-  nptr = num->n_value;
-  for (index=num->n_len; index>0; index--)
-    *sptr++ = BCD_CHAR(*nptr++);
+	/* Load the whole number. */
+	nptr = num->n_value;
+	for (index=num->n_len; index>0; index--)
+		*sptr++ = BCD_CHAR(*nptr++);
 
-  /* Now the fraction. */
-  if (num->n_scale > 0)
-    {
-      *sptr++ = '.';
-      for (index=0; index<num->n_scale; index++)
-	*sptr++ = BCD_CHAR(*nptr++);
-    }
+	/* Now the fraction. */
+	if (num->n_scale > 0)
+	{
+		*sptr++ = '.';
+		for (index=0; index<num->n_scale; index++)
+			*sptr++ = BCD_CHAR(*nptr++);
+	}
 
-  /* Terminate the string and return it! */
-  *sptr = '\0';
-  return (str);
+	/* Terminate the string and return it! */
+	*sptr = '\0';
+	str->len = sptr - (char *)str->val;
+	return str;
 }