diff options
| author | Armin Weatherwax | 2011-04-06 16:39:48 +0200 |
|---|---|---|
| committer | McCabe Maxsted | 2011-04-11 16:27:58 -0700 |
| commit | 8e3189342884340fcdc51a3c349ed63dc49ba74b (patch) | |
| tree | 23fc7a7c0cfca56f43ad4b258fc30c9ca0e6e195 /linden/indra/llcommon | |
| parent | Merge remote-tracking branch 'thickbrick/exp' into exp (diff) | |
| download | meta-impy-8e3189342884340fcdc51a3c349ed63dc49ba74b.zip meta-impy-8e3189342884340fcdc51a3c349ed63dc49ba74b.tar.gz meta-impy-8e3189342884340fcdc51a3c349ed63dc49ba74b.tar.bz2 meta-impy-8e3189342884340fcdc51a3c349ed63dc49ba74b.tar.xz | |
fix bug #853 crash caused by antistrings
Diffstat (limited to 'linden/indra/llcommon')
| -rw-r--r-- | linden/indra/llcommon/llstring.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/llcommon/llstring.cpp b/linden/indra/llcommon/llstring.cpp index 1f653c1..0f72d5e 100644 --- a/linden/indra/llcommon/llstring.cpp +++ b/linden/indra/llcommon/llstring.cpp | |||
| @@ -50,7 +50,8 @@ std::string ll_safe_string(const char* in) | |||
| 50 | 50 | ||
| 51 | std::string ll_safe_string(const char* in, S32 maxlen) | 51 | std::string ll_safe_string(const char* in, S32 maxlen) |
| 52 | { | 52 | { |
| 53 | if(in) return std::string(in, maxlen); | 53 | //KOKUA FIXME: Which wormhole all the antistrings (strings with negative length) come from ? |
| 54 | if(in && maxlen > 0) return std::string(in, maxlen); | ||
| 54 | return std::string(); | 55 | return std::string(); |
| 55 | } | 56 | } |
| 56 | 57 | ||