commit 1047a49d820c9d6b2b614eb47dc263aa1ff5b615
author Brian Salomon <bsalomon@google.com> Tue Jul 02 12:25:21 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 02 18:33:51 2019 +0000
tree d922a9265ca9713bf5567dd8800f7640dd7eb511
parent 5823f6b90c7bb07755952a5d2489b6fdcbbb24b6

GrGpu requires row bytes to be non-zero before read/writePixels and createTexture

Make GrGpu base class validate GrMipLevel arrays and row bytes parameters.

GrCaps states whether row bytes passed to GrGpu must be tight or not and callers
are responsible for temporary buffers if needed to make tight.

Change-Id: I2c522f7bd67c86044a36b3f70e13d7dcb38b0a6b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/224961
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/GrResourceProvider.cpp

diff --git a/src/gpu/GrResourceProvider.cpp b/src/gpu/GrResourceProvider.cpp
index 4f024c9..e4b01c2 100644
--- a/src/gpu/GrResourceProvider.cpp
+++ b/src/gpu/GrResourceProvider.cpp
@@ -5,10 +5,13 @@
  * found in the LICENSE file.
  */
 
+#include "src/gpu/GrResourceProvider.h"
+
 #include "include/gpu/GrBackendSemaphore.h"
 #include "include/gpu/GrContext.h"
 #include "include/private/GrResourceKey.h"
 #include "include/private/GrSingleOwner.h"
+#include "src/core/SkConvertPixels.h"
 #include "src/core/SkMathPriv.h"
 #include "src/gpu/GrCaps.h"
 #include "src/gpu/GrContextPriv.h"
@@ -19,7 +22,6 @@
 #include "src/gpu/GrProxyProvider.h"
 #include "src/gpu/GrRenderTargetPriv.h"
 #include "src/gpu/GrResourceCache.h"
-#include "src/gpu/GrResourceProvider.h"
 #include "src/gpu/GrSemaphore.h"
 #include "src/gpu/GrStencilAttachment.h"
 #include "src/gpu/GrTexturePriv.h"
@@ -55,7 +57,45 @@
         return nullptr;
     }
 
-    return fGpu->createTexture(desc, budgeted, texels, mipLevelCount);
+    SkAutoSTMalloc<14, GrMipLevel> tmpTexels;
+    SkAutoSTMalloc<14, std::unique_ptr<char[]>> tmpDatas;
+    if (mipLevelCount > 0 && texels) {
+        tmpTexels.reset(mipLevelCount);
+        tmpDatas.reset(mipLevelCount);
+        int w = desc.fWidth;
+        int h = desc.fHeight;
+        size_t bpp = GrBytesPerPixel(desc.fConfig);
+        for (int i = 0; i < mipLevelCount; ++i) {
+            if (texels->fPixels) {
+                size_t minRB = w * bpp;
+                if (!texels->fRowBytes) {
+                    tmpTexels[i].fRowBytes = minRB;
+                    tmpTexels[i].fPixels = texels[i].fPixels;
+                } else {
+                    if (texels[i].fRowBytes < minRB) {
+                        return nullptr;
+                    }
+                    if (this->caps()->writePixelsRowBytesSupport() &&
+                        texels[i].fRowBytes != minRB) {
+                        auto copy = new char[minRB * h];
+                        tmpDatas[i].reset(copy);
+                        SkRectMemcpy(copy, minRB, texels[i].fPixels, texels[i].fRowBytes, minRB, h);
+                        tmpTexels[i].fPixels = copy;
+                        tmpTexels[i].fRowBytes = minRB;
+                    } else {
+                        tmpTexels[i].fPixels = texels[i].fPixels;
+                        tmpTexels[i].fRowBytes = texels[i].fRowBytes;
+                    }
+                }
+            } else {
+                tmpTexels[i].fPixels = nullptr;
+                tmpTexels[i].fRowBytes = 0;
+            }
+            w = std::max(w / 2, 1);
+            h = std::max(h / 2, 1);
+        }
+    }
+    return fGpu->createTexture(desc, budgeted, tmpTexels.get(), mipLevelCount);
 }
 
 sk_sp<GrTexture> GrResourceProvider::getExactScratch(const GrSurfaceDesc& desc,