fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-01-20 12:30:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix broken Windows implementation of _dbus_printf_string_upper_bound().

Browse source 
Pass the correct buffer size when trying again, and keep trying with
larger buffer sizes, doubling the size each time.
(cherry picked from commit 95832a94607eea609de994467b7d64e36af72e6b)
This commit is contained in:
Ole André Vadla Ravnås 2009-03-29 01:44:44 +01:00 • committed by Ralf Habacker
parent 91f5972fa1
commit 29e8f9917a
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
dbus/dbus-sysdeps-win.c
View file

@ -658,23 +658,24 @@ int _dbus_printf_string_upper_bound (const char *format,
va_list args)
{
/* MSVCRT's vsnprintf semantics are a bit different */
/* The C library source in the Platform SDK indicates that this
* would work, but alas, it doesn't. At least not on Windows
* 2000. Presumably those sources correspond to the C library on
* some newer or even future Windows version.
*
len = _vsnprintf (NULL, _DBUS_INT_MAX, format, args);
*/
char p[1024];
char buf[1024];
int bufsize;
int len;
len = _vsnprintf (p, sizeof(p)-1, format, args);
if (len == -1) // try again
bufsize = sizeof (buf);
len = _vsnprintf (buf, bufsize - 1, format, args);
while (len == -1) /* try again */
{
char *p;
p = malloc (strlen(format)*3);
len = _vsnprintf (p, sizeof(p)-1, format, args);
free(p);
bufsize *= 2;
p = malloc (bufsize);
len = _vsnprintf (p, bufsize - 1, format, args);
free (p);
}
return len;
}