Prevent Null input in texSubImage2D(3D)

third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 4105 matching lines @@
         functionType = TexImage;
     else
         functionType = TexSubImage;
     if (!validateTexFunc(funcName, functionType, SourceArrayBufferView, target, level, internalformat, width, height, depth, border, format, type, xoffset, yoffset, zoffset))
         return;
     TexImageDimension sourceType;
     if (functionID == TexImage2D || functionID == TexSubImage2D)
         sourceType = Tex2D;
     else
         sourceType = Tex3D;
-    if (!validateTexFuncData(funcName, sourceType, level, width, height, depth, format, type, pixels, NullAllowed))
+    if ((functionType == TexImage && !validateTexFuncData(funcName, sourceType, level, width, height, depth, format, type, pixels, NullAllowed))
+        || (functionType == TexSubImage && !validateTexFuncData(funcName, sourceType, level, width, height, depth, format, type, pixels, NullNotAllowed)))

[Ken Russell (switch to Gerrit), 2016/06/08 21:13:07]

It would be better to add a "switch" statement here with TexImage and
TexSubImage as the only two arms, so that if someone accidentally adds another
enum value to TexImageFunctionType, a compile failure is triggered and we don't
accidentally fall through here.

[xidachen, 2016/06/09 01:12:08]

Done.

         return;
     void* data = pixels ? pixels->baseAddress() : 0;
     Vector<uint8_t> tempData;
     bool changeUnpackAlignment = false;
     if (data && (m_unpackFlipY || m_unpackPremultiplyAlpha)) {
         if (sourceType == Tex2D) {
             if (!WebGLImageConversion::extractTextureData(width, height, format, type, m_unpackAlignment, m_unpackFlipY, m_unpackPremultiplyAlpha, data, tempData))
                 return;
             data = tempData.data();
         }
@@ skipping 2288 matching lines @@
         contextGL()->PixelStorei(GL_UNPACK_ALIGNMENT, 1);
 }
 
 void WebGLRenderingContextBase::restoreUnpackParameters()
 {
     if (m_unpackAlignment != 1)
         contextGL()->PixelStorei(GL_UNPACK_ALIGNMENT, m_unpackAlignment);
 }
 
 } // namespace blink