diff options
author | Melanie | 2013-01-24 18:23:10 +0100 |
---|---|---|
committer | Melanie | 2013-01-24 18:23:10 +0100 |
commit | 9d2e832b85e35edea8bd177df9de4eb3ee18b004 (patch) | |
tree | dc5c1c0e5cac137a83f43541bd9f9237a88e5e03 /OpenSim/Region/CoreModules/Scripting | |
parent | Implement get version RemoteAdmin call (diff) | |
download | opensim-SC-9d2e832b85e35edea8bd177df9de4eb3ee18b004.zip opensim-SC-9d2e832b85e35edea8bd177df9de4eb3ee18b004.tar.gz opensim-SC-9d2e832b85e35edea8bd177df9de4eb3ee18b004.tar.bz2 opensim-SC-9d2e832b85e35edea8bd177df9de4eb3ee18b004.tar.xz |
Null check the response body to make sure we're not crashing the script engine
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs index 708b99d..0276267 100644 --- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs +++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs | |||
@@ -533,6 +533,9 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest | |||
533 | ResponseBody = e.Message; | 533 | ResponseBody = e.Message; |
534 | } | 534 | } |
535 | 535 | ||
536 | if (ResponseBody == null) | ||
537 | ResponseBody = String.Empty; | ||
538 | |||
536 | _finished = true; | 539 | _finished = true; |
537 | return; | 540 | return; |
538 | } | 541 | } |
@@ -546,6 +549,9 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest | |||
546 | response.Close(); | 549 | response.Close(); |
547 | } | 550 | } |
548 | 551 | ||
552 | if (ResponseBody == null) | ||
553 | ResponseBody = String.Empty; | ||
554 | |||
549 | _finished = true; | 555 | _finished = true; |
550 | } | 556 | } |
551 | 557 | ||