aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Siteshwar Vashisht <siteshwar@gmail.com>2012-02-23 23:10:51 +0530
committerGravatar Siteshwar Vashisht <siteshwar@gmail.com>2012-02-23 23:10:51 +0530
commitfd56465931698f8d2edf3b0964b775e20c25358d (patch)
tree0e4591983dd6404927e8f9f4741bfff7fadd96f8
parent376e199ebb562672f415e548c9d127b24117f905 (diff)
Fixed initialization of va_list variable in debug() in common.cpp, and mismatched new/free() in io.cpp
-rw-r--r--common.cpp6
-rw-r--r--io.cpp2
2 files changed, 5 insertions, 3 deletions
diff --git a/common.cpp b/common.cpp
index 4e3fe7c7..13d08512 100644
--- a/common.cpp
+++ b/common.cpp
@@ -668,8 +668,10 @@ void debug( int level, const wchar_t *msg, ... )
CHECK( msg, );
- sb = format_string(L"%ls: ", program_name);
- sb.append(vformat_string(msg, va));
+ sb = format_string(L"%ls: ", program_name);
+ va_start(va, msg);
+ sb.append(vformat_string(msg, va));
+ va_end(va);
wcstring sb2;
write_screen( sb, sb2 );
diff --git a/io.cpp b/io.cpp
index 2c18de96..75d6c253 100644
--- a/io.cpp
+++ b/io.cpp
@@ -152,7 +152,7 @@ void io_buffer_destroy( io_data_t *io_buffer )
b_destroy( io_buffer->param2.out_buffer );
free( io_buffer->param2.out_buffer );
- free( io_buffer );
+ delete io_buffer;
}