Fix for issue 23547, return an proper ApiError instead of a string when we report outstanding typed…

runtime/vm/dart_api_impl_test.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/builtin.h"
 #include "include/dart_api.h"
 #include "include/dart_debugger_api.h"
 #include "include/dart_mirrors_api.h"
 #include "include/dart_native_api.h"
 #include "platform/assert.h"
@@ skipping 1853 matching lines @@
 
 
 TEST_CASE(TypedDataDirectAccessVerified) {
   FLAG_verify_acquired_data = true;
   TestTypedDataDirectAccess();
 }
 
 
 static void TestDirectAccess(Dart_Handle lib,
                              Dart_Handle array,
-                             Dart_TypedData_Type expected_type) {
+                             Dart_TypedData_Type expected_type,
+                             bool is_external) {
   Dart_Handle result;
 
   // Invoke the dart function that sets initial values.
   Dart_Handle dart_args[1];
   dart_args[0] = array;
   result = Dart_Invoke(lib, NewString("setMain"), 1, dart_args);
   EXPECT_VALID(result);
 
   // Now Get a direct access to this typed data object and check it's contents.
   const int kLength = 10;
   Dart_TypedData_Type type;
   void* data;
   intptr_t len;
   result = Dart_TypedDataAcquireData(array, &type, &data, &len);
   EXPECT_VALID(result);
   EXPECT_EQ(expected_type, type);
   EXPECT_EQ(kLength, len);
   int8_t* dataP = reinterpret_cast<int8_t*>(data);
   for (int i = 0; i < kLength; i++) {
     EXPECT_EQ(i, dataP[i]);
   }
 
+  if (!is_external) {
+    // Now try allocating a string with outstanding Acquires and it should
+    // return an error.
+    result = NewString("We expect an error here");
+    EXPECT_ERROR(result,
+                 "Internal Dart data pointers have been acquired, "
+                 "please release them using Dart_TypedDataReleaseData.");
+  }
+
   // Now modify the values in the directly accessible array and then check
   // it we see the changes back in dart.
   for (int i = 0; i < kLength; i++) {
     dataP[i] += 10;
   }
 
   // Release direct accesss to the typed data object.
   result = Dart_TypedDataReleaseData(array);
   EXPECT_VALID(result);
 
@@ skipping 28 matching lines @@
       "  var a = new Int8List(10);"
       "  return a;"
       "}\n";
   // Create a test library and Load up a test script in it.
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
   // Test with an regular typed data object.
   Dart_Handle list_access_test_obj;
   list_access_test_obj = Dart_Invoke(lib, NewString("main"), 0, NULL);
   EXPECT_VALID(list_access_test_obj);
-  TestDirectAccess(lib, list_access_test_obj, Dart_TypedData_kInt8);
+  TestDirectAccess(lib, list_access_test_obj, Dart_TypedData_kInt8, false);
 
   // Test with an external typed data object.
   uint8_t data[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
   intptr_t data_length = ARRAY_SIZE(data);
   Dart_Handle ext_list_access_test_obj;
   ext_list_access_test_obj = Dart_NewExternalTypedData(Dart_TypedData_kUint8,
                                                        data, data_length);
   EXPECT_VALID(ext_list_access_test_obj);
-  TestDirectAccess(lib, ext_list_access_test_obj, Dart_TypedData_kUint8);
+  TestDirectAccess(lib, ext_list_access_test_obj, Dart_TypedData_kUint8, true);
 }
 
 
 TEST_CASE(TypedDataDirectAccess1Unverified) {
   FLAG_verify_acquired_data = false;
   TestTypedDataDirectAccess1();
 }
 
 
 TEST_CASE(TypedDataDirectAccess1Verified) {
@@ skipping 30 matching lines @@
       "  var view = new Int8List.view(a.buffer, 50, 10);"
       "  return view;"
       "}\n";
   // Create a test library and Load up a test script in it.
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
   // Test with a typed data view object.
   Dart_Handle list_access_test_obj;
   list_access_test_obj = Dart_Invoke(lib, NewString("main"), 0, NULL);
   EXPECT_VALID(list_access_test_obj);
-  TestDirectAccess(lib, list_access_test_obj, Dart_TypedData_kInt8);
+  TestDirectAccess(lib, list_access_test_obj, Dart_TypedData_kInt8, false);
 }
 
 
 TEST_CASE(TypedDataViewDirectAccessUnverified) {
   FLAG_verify_acquired_data = false;
   TestTypedDataViewDirectAccess();
 }
 
 
 TEST_CASE(TypedDataViewDirectAccessVerified) {
@@ skipping 30 matching lines @@
       "  var view = new ByteData.view(a.buffer, 50, 10);"
       "  return view;"
       "}\n";
   // Create a test library and Load up a test script in it.
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
   // Test with a typed data view object.
   Dart_Handle list_access_test_obj;
   list_access_test_obj = Dart_Invoke(lib, NewString("main"), 0, NULL);
   EXPECT_VALID(list_access_test_obj);
-  TestDirectAccess(lib, list_access_test_obj, Dart_TypedData_kByteData);
+  TestDirectAccess(lib, list_access_test_obj, Dart_TypedData_kByteData, false);
 }
 
 
 TEST_CASE(ByteDataDirectAccessUnverified) {
   FLAG_verify_acquired_data = false;
   TestByteDataDirectAccess();
 }
 
 
 TEST_CASE(ByteDataDirectAccessVerified) {
@@ skipping 7064 matching lines @@
     result = Dart_Invoke(lib,
                          NewString("testView16"),
                          1,
                          dart_args);
     EXPECT_VALID(result);
     EXPECT(Dart_IsString(result));
   }
 }
 
 }  // namespace dart