From 5cc44523f79b6cf495d2649fce9bf9e5181787e8 Mon Sep 17 00:00:00 2001 From: Aaron Brashears Date: Fri, 9 Feb 2007 23:35:12 +0000 Subject: Result of svn merge -r57350:57790 svn+ssh://svn/svn/linden/branches/os-patches.001 into release. --- indra/llcommon/llstring.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/llcommon/llstring.cpp') diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp index 50fd881ad7..767a72dfe9 100644 --- a/indra/llcommon/llstring.cpp +++ b/indra/llcommon/llstring.cpp @@ -176,6 +176,7 @@ llutf16string utf8str_to_utf16str ( const LLString& utf8str ) LLWString utf16str_to_wstring(const llutf16string &utf16str, S32 len) { LLWString wout; + if((len <= 0) || utf16str.empty()) return wout; S32 i = 0; // craziness to make gcc happy (llutf16string.c_str() is tweaked on linux): -- cgit v1.2.3