diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-02-16 00:57:46 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-02-16 00:57:46 +0000 |
| commit | db0f5847ea8b96b3c1ac08e7aeb43d83daacb8e4 (patch) | |
| tree | b7ccec1733db9054076708698c10d3e74b8f55da /indra/lscript/lscript_library.h | |
| parent | 8eea75dc3f4138a0b216e8d662089d2c930d5d45 (diff) | |
svn merge -r 80024:80160 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-1-Server
Port fixes for:
* DEV-10609 Checkboxes in About Land untick when selected
* Extend the sim node regex to support sim1-telstra.durga.lindenlab.com for colo testing.
* Provide "version_valid" for each version when querying a channel
* Update to latest eventlet r87, to handle multi-character terminators split across read buffers
* DEV-10487 Log viewer stats sim and php fix
* QAR-288: Pull in crash fixes from LSL bytecode parsing
Diffstat (limited to 'indra/lscript/lscript_library.h')
| -rw-r--r-- | indra/lscript/lscript_library.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/lscript/lscript_library.h b/indra/lscript/lscript_library.h index a15805fd11..d9702ced84 100644 --- a/indra/lscript/lscript_library.h +++ b/indra/lscript/lscript_library.h @@ -278,7 +278,7 @@ public: break; case LST_KEY: { - bytestream2char(temp, src, offset); + bytestream2char(temp, src, offset, sizeof(temp)); mKey = new char[strlen(temp) + 1]; /* Flawfinder: ignore */ if (mKey == NULL) { @@ -290,7 +290,7 @@ public: break; case LST_STRING: { - bytestream2char(temp, src, offset); + bytestream2char(temp, src, offset, sizeof(temp)); mString = new char[strlen(temp) + 1]; /* Flawfinder: ignore */ if (mString == NULL) { @@ -327,7 +327,7 @@ public: break; case LST_KEY: { - bytestream2char(temp, src, offset); + bytestream2char(temp, src, offset, sizeof(temp)); mKey = new char[strlen(temp) + 1]; /* Flawfinder: ignore */ if (mKey == NULL) { @@ -339,7 +339,7 @@ public: break; case LST_STRING: { - bytestream2char(temp, src, offset); + bytestream2char(temp, src, offset, sizeof(temp)); mString = new char[strlen(temp) + 1]; /* Flawfinder: ignore */ if (mString == NULL) { |