Fix HTTP response handling

runtime/bin/dartutils.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "bin/dartutils.h"
 
 #include "include/dart_api.h"
 
 #include "platform/assert.h"
 #include "platform/globals.h"
@@ skipping 269 matching lines @@
         Dart_GetField(builtin_lib,
                       DartUtils::NewString("_httpRequestStatusString"));
     if (Dart_IsError(responseStatus)) {
       return responseStatus;
     }
     if (Dart_IsNull(responseStatus)) {
       return Dart_Error("HTTP error.");
     }
     return Dart_Error(DartUtils::GetStringValue(responseStatus));
   }
-  Dart_Handle responseList =
+  Dart_Handle response =
     Dart_GetField(builtin_lib, DartUtils::NewString("_httpRequestResponse"));
-  if (Dart_IsError(responseList)) {
-    return responseList;
+  if (Dart_IsError(response)) {
+    return response;
   }
-  // Query list length.
-  result = Dart_ListLength(responseList, buffer_len);
-  if (Dart_IsError(result)) {
-    *buffer_len = 0;
-    *buffer = NULL;
-    return result;
-  }
-  // Get payload as bytes.
-  *buffer = reinterpret_cast<uint8_t*>(malloc(*buffer_len));
-  result = Dart_ListGetAsBytes(responseList, 0, *buffer, *buffer_len);
-  if (Dart_IsError(result)) {
-    free(*buffer);
-    *buffer_len = 0;
-    *buffer = NULL;
-    return result;
+  if (Dart_IsString(response)) {
+    // Received response as string.
+    const char* responseString = NULL;
+    Dart_Handle r = Dart_StringToCString(response, &responseString);

[Søren Gjesse, 2013/06/03 19:06:06]

Shouldn't this be Dart_StringToUTF8? E.g. what happens with the source 

main() => print("æøå");

?

[Cutch, 2013/06/03 20:03:20]

Done.

+    if (Dart_IsError(r)) {
+      *buffer = NULL;
+      *buffer_len = 0;
+      return r;
+    }
+    // Get payload as bytes.
+    *buffer_len = strlen(responseString)+1;
+    *buffer = reinterpret_cast<uint8_t*>(malloc(*buffer_len));
+    memmove(*buffer, responseString, *buffer_len);
+  } else {
+    // Received response as list of bytes.
+    ASSERT(Dart_IsList(response));
+    // Query list length.
+    result = Dart_ListLength(response, buffer_len);
+    if (Dart_IsError(result)) {
+      *buffer_len = 0;
+      *buffer = NULL;
+      return result;
+    }
+    // Get payload as bytes.
+    *buffer = reinterpret_cast<uint8_t*>(malloc(*buffer_len));
+    result = Dart_ListGetAsBytes(response, 0, *buffer, *buffer_len);

[Søren Gjesse, 2013/06/03 19:06:06]

Does it make sense to handle the HTTP response with a content type which cannot
be translated to text?

[Cutch, 2013/06/03 20:03:20]

Yes for a couple of reasons:

1) Loading snapshots which are binary.
2) Some HTTP servers serve *.dart files as binary, not as text.

+    if (Dart_IsError(result)) {
+      free(*buffer);
+      *buffer_len = 0;
+      *buffer = NULL;
+      return result;
+    }
   }
   return result;
 }
 
 
 Dart_Handle DartUtils::ReadStringFromHttp(const char* script_uri) {
   Dart_Handle uri = NewString(script_uri);
   if (Dart_IsError(uri)) {
     return uri;
   }
@@ skipping 613 matching lines @@
       new CObjectString(CObject::NewString(os_error->message()));
   CObjectArray* result = new CObjectArray(CObject::NewArray(3));
   result->SetAt(0, new CObjectInt32(CObject::NewInt32(kOSError)));
   result->SetAt(1, new CObjectInt32(CObject::NewInt32(os_error->code())));
   result->SetAt(2, error_message);
   return result;
 }
 
 }  // namespace bin
 }  // namespace dart