From b6d38ed4f78cc37da2ffc8a1e93cc2aadcfe38f2 Mon Sep 17 00:00:00 2001 From: "nhotta%netscape.com" Date: Thu, 28 Oct 1999 20:41:45 +0000 Subject: [PATCH] Check input for the null pointer and empty string, bug 17287, r=ducarroz,jefft. git-svn-id: svn://10.0.0.236/trunk@52109 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/intl/unicharutil/src/nsSaveAsCharset.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mozilla/intl/unicharutil/src/nsSaveAsCharset.cpp b/mozilla/intl/unicharutil/src/nsSaveAsCharset.cpp index 7fa59fd0728..62092faddc8 100644 --- a/mozilla/intl/unicharutil/src/nsSaveAsCharset.cpp +++ b/mozilla/intl/unicharutil/src/nsSaveAsCharset.cpp @@ -96,6 +96,10 @@ nsSaveAsCharset::Convert(const PRUnichar *inString, char **_retval) { if (nsnull == _retval) return NS_ERROR_NULL_POINTER; + if (nsnull == inString) + return NS_ERROR_NULL_POINTER; + if (0 == *inString) + return NS_ERROR_ILLEGAL_VALUE; nsresult rv; if (NULL == mEncoder) return NS_ERROR_FAILURE; // need to call Init() before Convert()