Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9793c459 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by Android Git Automerger
Browse files

am 3e1663a2: Merge change 7536 into donut 

Merge commit '3e1663a2539ff0b939193304cfb601f6b134af7d'

* commit '3e1663a2539ff0b939193304cfb601f6b134af7d':
  fix FILE* version of ZipUtils::inflateToBuffer
parents 7f608f03 0ff870e5

libs/utils/ZipUtils.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -210,7 +210,7 @@ bail: 
            LOGV("+++ reading %ld bytes (%ld left)\n",

            LOGV("+++ reading %ld bytes (%ld left)\n",

                getSize, compRemaining);

                getSize, compRemaining);





            int cc = fread(readBuf, getSize, 1, fp);

            int cc = fread(readBuf, 1, getSize, fp);

            if (cc != (int) getSize) {

            if (cc != (int) getSize) {

                LOGD("inflate read failed (%d vs %ld)\n",

                LOGD("inflate read failed (%d vs %ld)\n",

                    cc, getSize);

                    cc, getSize);
@@ -341,4 +341,3 @@ bail: 




    return true;

    return true;

}
 
}