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

Commit 3dcc2449 authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "applypatch: Add determine the return value of ApplyDiffPatch and... 

Merge "applypatch: Add determine the return value of ApplyDiffPatch and capture the error flow." am: ac78ed89
am: 282c8635

Change-Id: I4e9e5c6411b9ac58568bb7ea9491f533bf934bfc
parents c798cf25 282c8635

applypatch/imgpatch.cpp

+4 −1
Original line number Diff line number Diff line
@@ -100,7 +100,10 @@ int ApplyImagePatch(const unsigned char* old_data, size_t old_size, const Value* 
        printf("source data too short\n");

        return -1;

      }

      ApplyBSDiffPatch(old_data + src_start, src_len, patch, patch_offset, sink, ctx);

      if (ApplyBSDiffPatch(old_data + src_start, src_len, patch, patch_offset, sink, ctx) != 0) {

        printf("Failed to apply bsdiff patch.\n");

        return -1;

      }

    } else if (type == CHUNK_RAW) {

      const char* raw_header = &patch->data[pos];

      pos += 4;