[pull] master from php:master

NEWS

@@ -263,6 +263,8 @@ PHP                                                                        NEWS
     (nielsdos)
   . Fixed exit code handling of sendmail cmd and added warnings.
     (Jesse Hathaway)
+  . Fixed bug GH-18897 (printf: empty precision is interpreted as precision 6,
+    not as precision 0). (nielsdos)
 
 - Streams:
   . Fixed bug GH-16889 (stream_select() timeout useless for pipes on Windows).

UPGRADING

@@ -116,6 +116,11 @@ PHP 8.5 UPGRADE NOTES
   . SplFileObject::fwrite's parameter $length is now nullable. The default
     value changed from 0 to null.
 
+- Standard:
+  . Using a printf-family function with a formatter that did not specify the
+    precision previously incorrectly reset the precision instead of treating
+    it as a precision of 0. See GH-18897.
+
 ========================================
 2. New Features
 ========================================

UPGRADING.INTERNALS

@@ -43,6 +43,8 @@ PHP 8.5 INTERNALS UPGRADE NOTES
   . Added the zend_update_exception_properties() function for instantiating
     Exception child classes. It updates the $message, $code, and $previous
     properties.
+  . ZEND_IS_XDIGIT() macro was removed because it was unused and its name
+    did not match its actual behavior.
 
 ========================
 2. Build system changes

Zend/zend_operators.h

@@ -156,7 +156,6 @@ static zend_always_inline zend_long zend_dval_to_lval_safe(double d)
 }
 
 #define ZEND_IS_DIGIT(c) ((c) >= '0' && (c) <= '9')
-#define ZEND_IS_XDIGIT(c) (((c) >= 'A' && (c) <= 'F') || ((c) >= 'a' && (c) <= 'f'))
 
 static zend_always_inline uint8_t is_numeric_string_ex(const char *str, size_t length, zend_long *lval,
 	double *dval, bool allow_errors, int *oflow_info, bool *trailing_data)

ext/standard/formatted_print.c

@@ -591,6 +591,7 @@ php_formatted_print(char *format, size_t format_len, zval *args, int argc, int n
 						expprec = 1;
 					} else {
 						precision = 0;
+						adjusting |= ADJ_PRECISION;
 					}
 				} else {
 					precision = 0;

ext/standard/tests/strings/gh18897.phpt

@@ -0,0 +1,10 @@
+--TEST--
+GH-18897 (printf: empty precision is interpreted as precision 6, not as precision 0)
+--FILE--
+<?php
+printf("%.f\n", 3.1415926535);
+printf("%.0f\n", 3.1415926535);
+?>
+--EXPECT--
+3
+3

scripts/gdb/php_gdb.py

@@ -49,6 +49,8 @@ def children(self):
         for field in self.val.type.fields():
             if field.name == 'val':
                 yield ('val', format_zstr(self.val))
+            elif field.name == 'h':
+                yield (field.name, "0x%x" % self.val[field.name])
             else:
                 yield (field.name, format_nested(self.val[field.name]))
 
@@ -81,12 +83,11 @@ def to_string(self):
     def children(self):
         for field in self.val.type.fields():
             if field.name is None:
-                name = '<anonymous>'
-                val = self.val[field]
+                yield ('<anonymous>', format_nested(self.val[field]))
+            elif field.name == 'nTableMask':
+                yield (field.name, "0x%x" % self.val[field.name])
             else:
-                name = field.name
-                val = self.val[field.name]
-            yield (name, format_nested(val))
+                yield (field.name, format_nested(self.val[field.name]))
 
 pp_set.add_printer('zend_array', '^_zend_array$', ZendArrayPrettyPrinter)