commit a3337bc7c3a98ec12b6dec281e26c34f82025bdd
author Marco Nelissen <marcone@google.com> Thu Mar 20 16:58:36 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 20 16:58:37 2014 +0000
tree 3ffde6de6444cccf105756eff1af37df25d70644
parent 1c12f9e76298c757423155ad812890d27effafe8
parent c936d73adbd0fe9c698b89fe1a71d950fd89c935

Merge "Verify certificates" into jb-dev

core/jni/android/graphics/Paint.cpp

diff --git a/core/jni/android/graphics/Paint.cpp b/core/jni/android/graphics/Paint.cpp
index a65262c..8f68ae3 100644
--- a/core/jni/android/graphics/Paint.cpp
+++ b/core/jni/android/graphics/Paint.cpp
@@ -512,7 +512,7 @@
                 return 0;
             }
         }
-        jfloat advancesArray[count];
+        jfloat* advancesArray = new jfloat[count];
         jfloat totalAdvance = 0;
 
         TextLayout::getTextRunAdvances(paint, text, start, count, contextCount, flags,
@@ -521,6 +521,7 @@
         if (advances != NULL) {
             env->SetFloatArrayRegion(advances, advancesIndex, count, advancesArray);
         }
+        delete [] advancesArray;
         return totalAdvance;
     }