diff options
| author | Logan Dethrow <log@lindenlab.com> | 2012-12-13 18:35:07 -0500 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2012-12-13 18:35:07 -0500 |
| commit | 9015344f8e1d246726a8dc4fbfcefb7e74525e6a (patch) | |
| tree | ef17d2dbcc573a3126049e9bc444b78b7507ebc2 /indra/llcommon/llstring.cpp | |
| parent | 3565f6f36db90e1a9a5918d8087f9dc0ab61eb69 (diff) | |
| parent | 18ff702a9965ba8b9a17326b391f8edab01242f6 (diff) | |
Merged SH-3339 work with sunshine-internal. Still a WIP.
Diffstat (limited to 'indra/llcommon/llstring.cpp')
| -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(); } |