Piotr Caban : msvcp60: Don' t call _Eos on allocation error or 0-length string in basic_string::reserve .

Alexandre Julliard julliard at winehq.org
Thu Sep 19 17:21:05 CDT 2013


Module: wine
Branch: master
Commit: bd610a66c4da5954e60a4c9f9a3fe38b135e73ea
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bd610a66c4da5954e60a4c9f9a3fe38b135e73ea

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Thu Sep 19 11:58:55 2013 +0200

msvcp60: Don't call _Eos on allocation error or 0-length string in basic_string::reserve.

---

 dlls/msvcp60/string.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c
index 6fe2780..1f64621 100644
--- a/dlls/msvcp60/string.c
+++ b/dlls/msvcp60/string.c
@@ -1714,8 +1714,8 @@ void __thiscall basic_string_char_reserve(basic_string_char *this, MSVCP_size_t
     if(len > size)
         return;
 
-    basic_string_char__Grow(this, size, FALSE);
-    basic_string_char__Eos(this, len);
+    if(basic_string_char__Grow(this, size, FALSE))
+        basic_string_char__Eos(this, len);
 }
 
 /* ?empty@?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QBE_NXZ */
@@ -3429,8 +3429,8 @@ void __thiscall basic_string_wchar_reserve(basic_string_wchar *this, MSVCP_size_
     if(len > size)
         return;
 
-    basic_string_wchar__Grow(this, size, FALSE);
-    basic_string_wchar__Eos(this, len);
+    if(basic_string_wchar__Grow(this, size, FALSE))
+        basic_string_wchar__Eos(this, len);
 }
 
 /* ?empty@?$basic_string at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@QBE_NXZ */




More information about the wine-cvs mailing list