commit 115fbf66a97cf9cb5f043804c8011f80c1da88af
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Sep 10 17:37:03 2013 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Sep 10 17:37:03 2013 +0000
tree cfd0d3369269d4c5f8fb845c8d79292aa076f85d
parent 8ad29cea429e5b6f5b37f647a0eacadd7c9cf86a

Fix uninitialized string bug

https://codereview.chromium.org/23499013/



git-svn-id: http://skia.googlecode.com/svn/trunk@11182 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/gl/GrGLEffectMatrix.cpp

diff --git a/src/gpu/gl/GrGLEffectMatrix.cpp b/src/gpu/gl/GrGLEffectMatrix.cpp
index ef3812e..512bef9 100644
--- a/src/gpu/gl/GrGLEffectMatrix.cpp
+++ b/src/gpu/gl/GrGLEffectMatrix.cpp
@@ -58,6 +58,7 @@
     switch (key & kMatrixTypeKeyMask) {
         case kIdentity_MatrixType:
             fUniType = kVoid_GrSLType;
+            uniName = NULL;
             varyingType = kVec2f_GrSLType;
             break;
         case kTrans_MatrixType:
@@ -79,12 +80,12 @@
             GrCrash("Unexpected key.");
     }
     SkString suffixedUniName;
-    if (NULL != suffix) {
-        suffixedUniName.append(uniName);
-        suffixedUniName.append(suffix);
-        uniName = suffixedUniName.c_str();
-    }
     if (kVoid_GrSLType != fUniType) {
+        if (NULL != suffix) {
+            suffixedUniName.append(uniName);
+            suffixedUniName.append(suffix);
+            uniName = suffixedUniName.c_str();
+        }
         fUni = builder->addUniform(GrGLShaderBuilder::kVertex_Visibility,
                                    fUniType,
                                    uniName,