more reinforcement that images never have zero width or height
BUG=skia:
Review URL: https://codereview.chromium.org/869743002
diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp
index 4636686..1dd57d6 100644
--- a/src/image/SkImage_Raster.cpp
+++ b/src/image/SkImage_Raster.cpp
@@ -186,11 +186,18 @@
if (!SkInstallDiscardablePixelRef(generator, &bitmap)) {
return NULL;
}
+ if (0 == bitmap.width() || 0 == bitmap.height()) {
+ return NULL;
+ }
+
return SkNEW_ARGS(SkImage_Raster, (bitmap, NULL));
}
SkImage* SkNewImageFromPixelRef(const SkImageInfo& info, SkPixelRef* pr, size_t rowBytes,
const SkSurfaceProps* props) {
+ if (!SkImage_Raster::ValidArgs(info, rowBytes)) {
+ return NULL;
+ }
return SkNEW_ARGS(SkImage_Raster, (info, pr, rowBytes, props));
}