Fix bug in SkWriter32.

tests/Writer32Test.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 
 #include "SkRandom.h"
 #include "SkReader32.h"
 #include "SkWriter32.h"
 #include "Test.h"
 
 static void check_contents(skiatest::Reporter* reporter, const SkWriter32& writer,
                            const void* expected, size_t size) {
     SkAutoSMalloc<256> storage(size);
     REPORTER_ASSERT(reporter, writer.bytesWritten() == size);
     writer.flatten(storage.get());
     REPORTER_ASSERT(reporter, !memcmp(storage.get(), expected, size));
 }
 
+
+static void test_reserve(skiatest::Reporter* reporter) {
+    // There used to be a bug where we'd assert your first reservation had to
+    // fit in external storage if you used it.  This would crash in debug mode.
+    uint8_t storage[4];
+    SkWriter32 writer(0, storage, sizeof(storage));
+    writer.reserve(40);
+}
+
 static void test_string_null(skiatest::Reporter* reporter) {
     uint8_t storage[8];
     SkWriter32 writer(0, storage, sizeof(storage));
 
     // Can we write NULL?
     writer.writeString(NULL);
     const int32_t expected[] = { 0x0, 0x0 };
     check_contents(reporter, writer, expected, sizeof(expected));
 }
 
@@ skipping 197 matching lines @@
     {
         SkSWriter32<1024 * sizeof(intptr_t)> writer(100);
         test1(reporter, &writer);
         writer.reset(); // should just rewind our storage
         test2(reporter, &writer);
 
         writer.reset();
         testWritePad(reporter, &writer);
     }
 
+    test_reserve(reporter);
     test_string_null(reporter);
     test_ptr(reporter);
     test_rewind(reporter);
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("Writer32", Writer32Class, Tests)