koral--#167 fixed

froggy96 · May 16, 2015 · 1966768 · 1966768
1 parent a4dc65d
commit 1966768
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,10 +13,10 @@ android:
     - extra-android-m2repository
 
 before_install:
-  - wget http://dl.google.com/android/ndk/android-ndk-r10d-linux-x86_64.bin
+  - wget http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin
   - chmod +x android-ndk-r10d-linux-x86_64.bin
-  - ./android-ndk-r10d-linux-x86_64.bin | egrep -v ^Extracting
-  - export ANDROID_NDK_HOME=`pwd`/android-ndk-r10d
+  - ./android-ndk-r10e-linux-x86_64.bin | egrep -v ^Extracting
+  - export ANDROID_NDK_HOME=`pwd`/android-ndk-r10e
   - export PATH=${PATH}:${ANDROID_NDK_HOME}
 
 script:

diff --git a/src/main/jni/drawing.c b/src/main/jni/drawing.c
@@ -93,7 +93,7 @@ static inline void disposeFrameIfNeeded(argb *bm, GifInfo *info) {
     unsigned char nextDisposal = info->controlBlock[info->currentIndex].DisposalMode;
 
     if ((curDisposal == DISPOSE_PREVIOUS || nextDisposal == DISPOSE_PREVIOUS) && info->backupPtr == NULL) {
-        info->backupPtr = malloc(info->stride * fGif->SHeight * sizeof(argb));
+        info->backupPtr = calloc(info->stride * fGif->SHeight, sizeof(argb));
         if (!info->backupPtr) {
             info->gifFilePtr->Error = D_GIF_ERR_NOT_ENOUGH_MEM; //TODO throw OOME
             return;