Enabling validation code in serialization and adding serialization to fuzzer

samplecode/SampleFilterFuzz.cpp

Index: samplecode/SampleFilterFuzz.cpp
diff --git a/samplecode/SampleFilterFuzz.cpp b/samplecode/SampleFilterFuzz.cpp
index 17e8306f69bb0fc23169c450dca1ac988426332e..65ddeda9f7b3cef4763b436f59b1d391b8507632 100644
--- a/samplecode/SampleFilterFuzz.cpp
+++ b/samplecode/SampleFilterFuzz.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2013 Google Inc.
  *
@@ -7,13 +6,14 @@
  */
 #include "SampleCode.h"
 #include "SkBicubicImageFilter.h"
+#include "SkBitmapDevice.h"
 #include "SkBitmapSource.h"
 #include "SkBlurImageFilter.h"
 #include "SkCanvas.h"
 #include "SkColorFilter.h"
 #include "SkColorFilterImageFilter.h"
 #include "SkComposeImageFilter.h"
-#include "SkBitmapDevice.h"
+#include "SkData.h"
 #include "SkDisplacementMapEffect.h"
 #include "SkDropShadowImageFilter.h"
 #include "SkFlattenableSerialization.h"
@@ -262,6 +262,25 @@ static SkImageFilter* make_image_filter(bool canBeNull = true) {
     return (filter || canBeNull) ? filter : make_image_filter(canBeNull);
 }
 
+SkImageFilter* make_serialized_image_filter() {
+    SkImageFilter* filter = make_image_filter(false);

[mtklein, 2013/10/25 16:17:31]

Coming new at this, sorry if these are dumb questions.  Where do this filter and
data get deleted?

[Stephen White, 2013/10/25 16:36:21]

Oooh, good catch. This probably leaks (Alexis can correct me if I'm wrong).

There are two Skia-approved ways to handle this:

- put the result of all new or factory functions into an SkAutoTUnref<Foo> at
the callsite below (my preference)
- call paint.setImageFilter(foo)->unref() to free the ref created by
new/factoryfn

(Grumble grumble need smart pointers grumble.)

[sugoi1, 2013/10/25 17:15:04]

I probably had an initial implementation that gave the ownership of these to
another object, but I changed this code so many times for tests, that I probably
removed all ownership of these at some point :) I added the SkAutoTUnref "smart"
pointers.

+    SkData* data = SkValidatingSerializeFlattenable(filter);
+    unsigned char* ptr = static_cast<unsigned char*>(const_cast<void*>(data->data()));

[mtklein, 2013/10/25 16:17:31]

Seems like you don't need the const_cast until you assign to p?

[sugoi1, 2013/10/25 17:15:04]

Done.

+    size_t len = data->size();
+#ifdef SK_ADD_RANDOM_BIT_FLIPS
+    unsigned char* p = ptr;
+    for (size_t i = 0; i < len; ++i, ++p) {
+        if ((R(1000) == 1)) { // 0.1% of the time, flip a bit
+            *p ^= (1 << R(8));
+        }
+    }
+#endif // SK_ADD_RANDOM_BIT_FLIPS
+    SkFlattenable* flattenable = SkValidatingDeserializeFlattenable(ptr, len,
+                                    SkImageFilter::GetFlattenableType());
+    SkASSERT(NULL != flattenable);
+    return static_cast<SkImageFilter*>(flattenable);
+}
+
 static void drawClippedBitmap(SkCanvas* canvas, int x, int y, const SkPaint& paint) {
     canvas->save();
     canvas->clipRect(SkRect::MakeXYWH(SkIntToScalar(x), SkIntToScalar(y),
@@ -272,7 +291,7 @@ static void drawClippedBitmap(SkCanvas* canvas, int x, int y, const SkPaint& pai
 
 static void do_fuzz(SkCanvas* canvas) {
     SkPaint paint;
-    paint.setImageFilter(make_image_filter());
+    paint.setImageFilter(make_serialized_image_filter());
     drawClippedBitmap(canvas, 0, 0, paint);
 }