generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reference: http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20130325/077131.html

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@178544 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Howard Hinnant 2013-04-02 15:46:31 +00:00
parent 9d00ed5d87
commit a1985ebbc8
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/support/win32/support.cpp
View File

@ -23,14 +23,23 @@ int asprintf(char **sptr, const char *__restrict fmt, ...)
va_end(ap); va_end(ap);
return result; return result;
} }
// Like sprintf, but when return value >= 0 it returns a pointer to a malloc'd string in *sptr.
// If return >= 0, use free to delete *sptr.
int vasprintf( char **sptr, const char *__restrict fmt, va_list ap ) int vasprintf( char **sptr, const char *__restrict fmt, va_list ap )
{ {
*sptr = NULL; *sptr = NULL;
int count = vsnprintf( *sptr, 0, fmt, ap ); int count = vsnprintf( NULL, 0, fmt, ap ); // Query the buffer size required.
if( (count >= 0) && ((*sptr = (char*)malloc(count+1)) != NULL) ) if( count >= 0 ) {
{ char* p = static_cast<char*>(malloc(count+1)); // Allocate memory for it and the terminator.
vsprintf( *sptr, fmt, ap ); if ( p == NULL )
sptr[count] = '\0'; return -1;
if ( vsnprintf( p, count+1, fmt, ap ) == count ) // We should have used exactly what was required.
*sptr = p;
else { // Otherwise something is wrong, likely a bug in vsnprintf. If so free the memory and report the error.
free(p);
return -1;
}
} }
return count; return count;