From f90fa8e9f240edccc463fb3e4bf699566ec6fec6 Mon Sep 17 00:00:00 2001 From: "alecf%netscape.com" Date: Thu, 8 Jun 2000 23:34:53 +0000 Subject: [PATCH] fix purify errors - uninitialized memory on poorly formatted CID strings, and FMM on nsString::fputs r=waterson, scc a=waterson git-svn-id: svn://10.0.0.236/trunk@71822 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/string/obsolete/nsString2.cpp | 2 +- mozilla/xpcom/base/nsID.cpp | 1 + mozilla/xpcom/ds/nsString2.cpp | 2 +- mozilla/xpcom/string/obsolete/nsString2.cpp | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mozilla/string/obsolete/nsString2.cpp b/mozilla/string/obsolete/nsString2.cpp index 05b32a47dda..1e85b47def2 100644 --- a/mozilla/string/obsolete/nsString2.cpp +++ b/mozilla/string/obsolete/nsString2.cpp @@ -2186,7 +2186,7 @@ NS_COM int fputs(const nsString& aString, FILE* out) if(len>0) ::fwrite(cp, 1, len, out); if (cp != buf) { - delete[] cp; + Recycle(cp); } return (int) len; } diff --git a/mozilla/xpcom/base/nsID.cpp b/mozilla/xpcom/base/nsID.cpp index bc47708d3fa..ba0d468e0d8 100644 --- a/mozilla/xpcom/base/nsID.cpp +++ b/mozilla/xpcom/base/nsID.cpp @@ -39,6 +39,7 @@ NS_COM PRBool nsID::Parse(const char *aIDStr) PRInt32 count = 0; PRInt32 n1, n2, n3[8]; PRInt32 n0; + ::memset(n3, 0, sizeof(n3)); if (NULL != aIDStr) { count = PR_sscanf(aIDStr, diff --git a/mozilla/xpcom/ds/nsString2.cpp b/mozilla/xpcom/ds/nsString2.cpp index 05b32a47dda..1e85b47def2 100644 --- a/mozilla/xpcom/ds/nsString2.cpp +++ b/mozilla/xpcom/ds/nsString2.cpp @@ -2186,7 +2186,7 @@ NS_COM int fputs(const nsString& aString, FILE* out) if(len>0) ::fwrite(cp, 1, len, out); if (cp != buf) { - delete[] cp; + Recycle(cp); } return (int) len; } diff --git a/mozilla/xpcom/string/obsolete/nsString2.cpp b/mozilla/xpcom/string/obsolete/nsString2.cpp index 05b32a47dda..1e85b47def2 100644 --- a/mozilla/xpcom/string/obsolete/nsString2.cpp +++ b/mozilla/xpcom/string/obsolete/nsString2.cpp @@ -2186,7 +2186,7 @@ NS_COM int fputs(const nsString& aString, FILE* out) if(len>0) ::fwrite(cp, 1, len, out); if (cp != buf) { - delete[] cp; + Recycle(cp); } return (int) len; }