Revert "[ CID 15998 ] libgraphics: image.cpp: Dereference before null check in MCGImageCreateWithSkBitmap"

livecodeian · livecodeian · commit 68b5cb46188c · 2015-01-30T10:28:55.000Z
This reverts commit 3077045.
diff --git a/libgraphics/src/image.cpp b/libgraphics/src/image.cpp
@@ -47,12 +47,12 @@ bool MCGImageCreateWithSkBitmap(const SkBitmap &p_bitmap, MCGImageRef &r_image)
 	if (t_success)
 	{
 		t_bitmap = new SkBitmap(p_bitmap);
+        t_bitmap -> lockPixels();
 		t_success = nil != t_bitmap;
 	}
 	
 	if (t_success)
 	{
-		t_bitmap -> lockPixels();
 		t_image -> bitmap = t_bitmap;
 		t_image -> is_valid = true;
 		t_image -> references = 1;

Original file line number	Diff line number	Diff line change
`@@ -47,12 +47,12 @@ bool MCGImageCreateWithSkBitmap(const SkBitmap &p_bitmap, MCGImageRef &r_image)`
`47`	`47`	`if (t_success)`
`48`	`48`	`{`
`49`	`49`	`t_bitmap = new SkBitmap(p_bitmap);`
	`50`	`+ t_bitmap -> lockPixels();`
`50`	`51`	`t_success = nil != t_bitmap;`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`if (t_success)`
`54`	`55`	`{`
`55`		`- t_bitmap -> lockPixels();`
`56`	`56`	`t_image -> bitmap = t_bitmap;`
`57`	`57`	`t_image -> is_valid = true;`
`58`	`58`	`t_image -> references = 1;`