aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorCharles Krinke2008-07-31 15:11:44 +0000
committerCharles Krinke2008-07-31 15:11:44 +0000
commit1f7fde9436c44a0842897a0e0de2228259a54d4d (patch)
tree27d54712519cceeef6070bb06680ac62b848e1dd
parentThank you, HomerHorwitz, for a patch that implements llSetCameraParams/llClea... (diff)
downloadopensim-SC_OLD-1f7fde9436c44a0842897a0e0de2228259a54d4d.zip
opensim-SC_OLD-1f7fde9436c44a0842897a0e0de2228259a54d4d.tar.gz
opensim-SC_OLD-1f7fde9436c44a0842897a0e0de2228259a54d4d.tar.bz2
opensim-SC_OLD-1f7fde9436c44a0842897a0e0de2228259a54d4d.tar.xz
Mantis#1868. Thank you kindly, HomerHorwitz for a patch that:
0001868: llXorBase64StringsCorrect leads to error if second string shorter than first which was an off by one error.
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index bdca67c..422ff71 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -7056,7 +7056,7 @@ namespace OpenSim.Region.ScriptEngine.Common
7056 ret += src1[i] ^ src2[c]; 7056 ret += src1[i] ^ src2[c];
7057 7057
7058 c++; 7058 c++;
7059 if (c > src2.Length) 7059 if (c >= src2.Length)
7060 c = 0; 7060 c = 0;
7061 } 7061 }
7062 return llStringToBase64(ret); 7062 return llStringToBase64(ret);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index dadad02..e5c6ac1 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -6834,7 +6834,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6834 ret += src1[i] ^ src2[c]; 6834 ret += src1[i] ^ src2[c];
6835 6835
6836 c++; 6836 c++;
6837 if (c > src2.Length) 6837 if (c >= src2.Length)
6838 c = 0; 6838 c = 0;
6839 } 6839 }
6840 return llStringToBase64(ret); 6840 return llStringToBase64(ret);