- Patch #49993 by Sid_M: fixed two minor problems with HTTPGet().

1) There is a race condition created by calling send() before setting the callback function. Admittedly, this race shouldn't be lost, but it's not good practice to bet on winning races in code.

2) Line 55 is redundant. Since the value of bAsync is based on the non/existence of callbackFunction, there is no need to check both variables later.

1 files changed, 7 insertions, 10 deletions

diff --git a/misc/drupal.js b/misc/drupal.js
index 539338ea3..4fd536463 100644
--- a/misc/drupal.js
+++ b/misc/drupal.js
@@ -48,15 +48,14 @@ function HTTPGet(uri, callbackFunction, callbackParameter) {
   if (!callbackFunction) {
     bAsync = false;
   }
+
   xmlHttp.open('GET', uri, bAsync);
   xmlHttp.send(null);
 
   if (bAsync) {
-    if (callbackFunction) {
-      xmlHttp.onreadystatechange = function() {
-        if (xmlHttp.readyState == 4) {
-          callbackFunction(xmlHttp.responseText, xmlHttp, callbackParameter);
-        }
+    xmlHttp.onreadystatechange = function() {
+      if (xmlHttp.readyState == 4) {
+        callbackFunction(xmlHttp.responseText, xmlHttp, callbackParameter);
       }
     }
     return xmlHttp;
@@ -93,11 +92,9 @@ function HTTPPost(uri, callbackFunction, callbackParameter, object) {
   xmlHttp.send(toSend);
 
   if (bAsync) {
-    if (callbackFunction) {
-      xmlHttp.onreadystatechange = function() {
-        if (xmlHttp.readyState == 4) {
-          callbackFunction(xmlHttp.responseText, xmlHttp, callbackParameter);
-        }
+    xmlHttp.onreadystatechange = function() {
+      if (xmlHttp.readyState == 4) {
+        callbackFunction(xmlHttp.responseText, xmlHttp, callbackParameter);
       }
     }
     return xmlHttp;