RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-30 15:33:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #387 from ceph/wip-5346

Browse Source 
rgw: add RGWFormatter_Plain allocation to sidestep cranky strlen()

Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
This commit is contained in:
Yehuda Sadeh 2013-07-01 21:00:02 -07:00
commit 08123b6a13
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/rgw/rgw_formats.cc
View File

@ -165,7 +165,7 @@ void RGWFormatter_Plain::write_data(const char *fmt, ...)
{
#define LARGE_ENOUGH_LEN 128
int n, size = LARGE_ENOUGH_LEN;
char s[size];
char s[size + 8];
char *p, *np;
bool p_on_stack;
va_list ap;
@ -187,9 +187,9 @@ void RGWFormatter_Plain::write_data(const char *fmt, ...)
else /* glibc 2.0 */
size *= 2; /* twice the old size */
if (p_on_stack)
np = (char *)malloc(size);
np = (char *)malloc(size + 8);
else
np = (char *)realloc(p, size);
np = (char *)realloc(p, size + 8);
if (!np)
goto done_free;
p = np;