Merge lp:~vkolesnikov/pbxt/pbxt-vasprintf into lp:pbxt

[Vladimir Kolesnikov]

merged into the latest lp:pbxt

[Paul McCullagh (paul-mccullagh)]

Hi Vlad,

I am not so sure about this now. The code no longer uses ap2. But, I think it may be required, as was done previously. I think the first call to vsnprintf() clobbers ap.

It would be good to run this code once to check that it works.

=== modified file 'src/thread_xt.cc'
--- src/thread_xt.cc	2010-05-06 12:37:19 +0000
+++ src/thread_xt.cc	2010-09-02 14:26:09 +0000
@@ -203,7 +203,8 @@
 {
 	char buffer[DEFAULT_LOG_BUFFER_SIZE];
 	char *log_string = NULL;
-
+	int bufsize;
+	
 	if (level > log_level)
 		return;
 
@@ -226,9 +227,13 @@
 	va_list ap2;
 
 	va_copy(ap2, ap);
-	if (vsnprintf(buffer, DEFAULT_LOG_BUFFER_SIZE, fmt, ap) >= DEFAULT_LOG_BUFFER_SIZE) {
-		if (vasprintf(&log_string, fmt, ap2) == -1)
+	bufsize = vsnprintf(buffer, DEFAULT_LOG_BUFFER_SIZE, fmt, ap);
+	if (bufsize >= DEFAULT_LOG_BUFFER_SIZE) {
+		log_string = (char *)malloc(bufsize + 1);
+		if (vsnprintf(log_string, bufsize + 1, fmt, ap) > bufsize) {
+			free(log_string);
 			log_string = NULL;
+		}
 	}
 	else
 		log_string = buffer;