diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-11-13 11:57:14 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-11-13 11:57:14 -0500 |
| commit | be210914f4e9081f021cc1ad3b671765aba79b61 (patch) | |
| tree | 006e4ec827b8c1b3cf6042c08e12aadf48f43943 /indra/llcommon | |
| parent | 7e779a29c142feaa34a30dff39b72d0ae7c0fdc3 (diff) | |
| parent | d8f081cf1b18ddb5f0412b21f4d36bfce6abae19 (diff) | |
merge changes for DRTVWR-238
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llstring.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp index fa0eb9f72c..0c32679744 100644 --- a/indra/llcommon/llstring.cpp +++ b/indra/llcommon/llstring.cpp @@ -47,7 +47,8 @@ std::string ll_safe_string(const char* in) std::string ll_safe_string(const char* in, S32 maxlen) { - if(in) return std::string(in, maxlen); + if(in && maxlen > 0 ) return std::string(in, maxlen); + return std::string(); } |