From d1f390792b9f8623ade34f7c58a294519d8487ef Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Tue, 15 Aug 2006 17:47:34 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=10922 --- checkin_notes | 8 ++++++++ lib/miofile.C | 4 +++- win_build/installerv2/BOINC.ism | Bin 206336 -> 206336 bytes 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/checkin_notes b/checkin_notes index fbf6925e67..0f402859ea 100755 --- a/checkin_notes +++ b/checkin_notes @@ -8853,3 +8853,11 @@ David 15 Aug 2006 clientgui/ MainDocument.cpp,h +Rom 15 Aug 2006 + - lib: Fix missing case for MIOFILE where MIOFILE.printf didn't know how + to handle memory buffers. It was calling vfprintf with a null file + handle and crashed. + + lib/ + miofile.C + diff --git a/lib/miofile.C b/lib/miofile.C index 2be55e13bd..afdf749da8 100644 --- a/lib/miofile.C +++ b/lib/miofile.C @@ -61,8 +61,10 @@ int MIOFILE::printf(const char* format, ...) { va_start(ap, format); if (mf) { retval = mf->vprintf(format, ap); - } else { + } else if (f) { retval = vfprintf(f, format, ap); + } else { + retval = vsprintf(buf, format, ap); } va_end(ap); return retval; diff --git a/win_build/installerv2/BOINC.ism b/win_build/installerv2/BOINC.ism index 7ddd6487df96625d2b69da8521282e16f9268826..b29a29bf0b41464b9b4b33baef13392562e7b23b 100644 GIT binary patch delta 493 zcmXBQKWGzC00!{9_bxA?CQTYq6GOvcq;)VgF@H>)yyTLaK-!X|f`Ig2SF=Vpd2Ag@l;D zR7qsg1tC#LUo0mwxnw?B77CSQwlI9VHuU4{LUtjQo;-To_n6OK`p}#UOkTh8Lx3mm z-!uW{sn(XMIku0DKX91JgKD#3ns#)&$6=Z8C{DKT=zzl-zb@;#d1yzCX~4m1XKP11 zZ=DN){kV|>-015!c*>f&41NY!4R{Ar^C;k*@%p{*kQMq2YEk&dZ{7S3#wkqN_ZGV{ z3qsptgdxPVlOHY-b{g8qh{3bCexLRf%8LJ7fgElVk=~J54cc)-h1}?f!iaUe3xC9o zZ6{V0X93S%K>LF6#WAI%(;#fmsk1|Pu(*MyFcqdVnRTo6~mCNy?F;tyQryr=dx^_i#njY$WyH;(c#*8?~B{LKHEamd^6`|I1?%wNqK~yhk$>i|SQ$O)|JkI8`07fb2 z)$?WKfHm0#R9Y98m#o*E1H(xSB)+9c)EaYGTiwVO6He;$ml$Y#TQUsmrz>r{lGw`d zXB0b#I0iFll7v&@O6}~5T|}HIe8o|gIEa3PKyF?=qD!MX@~uz5Bq85!U%>Y_z-Hc| zdJLz7?80|s2@Jw`;sx3&_m0bU6k`T^usiwK4cbwtoxpPpsyjhbUZATDdl9>(bv#L$ zC$3?z)g9Db1XXb_;_U(E%mb5`N@M&n2~;+Y z%5=1ie@`J`e|}*SCT&^Y(C*~eAs=~b1xL6SyL$P_YyU|tE4 z!5~87c9?(}3X%xRMaW?izo;o{v+-YQbQQIwb&ZCic4T_9Tx9K8vM@#B9>iFJh~9rS C=BiKt