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

MFH(r1.65): Fixed bug #22227

Browse Source 
MFH: Added test case for bug #22227
This commit is contained in:
Moriyoshi Koizumi
2003-02-15 15:59:13 +00:00
parent e572e41cff
commit 68b0858da6
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/standard/formatted_print.c
+11 -12
View File
@@ -158,12 +158,11 @@ php_sprintf_appendstring(char **buffer, int *pos, int *size, char *add,
int alignment, int len, int sign, int expprec)
{
register int npad;
int req_size;
int copy_len;
if (max_width && min_width) {
expprec = max_width = 0;
}
npad = min_width - MIN(len, (expprec ? max_width : len));
copy_len = (expprec ? MIN(max_width, len) : len);
npad = min_width - copy_len;
if (npad < 0) {
npad = 0;
@@ -171,11 +170,11 @@ php_sprintf_appendstring(char **buffer, int *pos, int *size, char *add,
PRINTF_DEBUG(("sprintf: appendstring(%x, %d, %d, \"%s\", %d, '%c', %d)\n",
*buffer, *pos, *size, add, min_width, padding, alignment));
if ((max_width == 0) && (! expprec)) {
max_width = MAX(min_width, len);
}
if ((*pos + max_width) >= *size) {
while ((*pos + max_width) >= *size) {
req_size = *pos + MAX(min_width, copy_len) + 1;
if (req_size > *size) {
while (req_size > *size) {
*size <<= 1;
}
PRINTF_DEBUG(("sprintf ereallocing buffer to %d bytes\n", *size));
@@ -192,8 +191,8 @@ php_sprintf_appendstring(char **buffer, int *pos, int *size, char *add,
}
}
PRINTF_DEBUG(("sprintf: appending \"%s\"\n", add));
memcpy(&(*buffer)[*pos], add, MIN(max_width, len)+1);
*pos += MIN(max_width, len);
memcpy(&(*buffer)[*pos], add, copy_len + 1);
*pos += copy_len;
if (alignment == ALIGN_LEFT) {
while (npad--) {
(*buffer)[(*pos)++] = padding;