Return BSPatch value (previously, was ignored).

courgette/third_party/bsdiff/bsdiff_apply.cc

 // Copyright 2003, 2004 Colin Percival
 // All rights reserved
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted providing that the following conditions
 // are met:
 // 1. Redistributions of source code must retain the above copyright
 //    notice, this list of conditions and the following disclaimer.
 // 2. Redistributions in binary form must reproduce the above copyright
 //    notice, this list of conditions and the following disclaimer in the
@@ skipping 79 matching lines @@
   SourceStream* control_stream_copy_counts = patch_streams.stream(0);
   SourceStream* control_stream_extra_counts = patch_streams.stream(1);
   SourceStream* control_stream_seeks = patch_streams.stream(2);
   SourceStream* diff_skips = patch_streams.stream(3);
   SourceStream* diff_bytes = patch_streams.stream(4);
   SourceStream* extra_bytes = patch_streams.stream(5);
 
   const uint8_t* extra_start = extra_bytes->Buffer();
   const uint8_t* extra_end = extra_start + extra_bytes->Remaining();
   const uint8_t* extra_position = extra_start;
+  extra_bytes->Skip(extra_bytes->Remaining());
 
   const uint8_t* old_position = old_start;
 
   if (header->dlen && !new_stream->Reserve(header->dlen))
     return MEM_ERROR;
 
   uint32_t pending_diff_zeros = 0;
   if (!diff_skips->ReadVarint32(&pending_diff_zeros))
     return UNEXPECTED_ERROR;
 
@@ skipping 68 matching lines @@
 
   const uint8_t* old_start = old_stream->Buffer();
   size_t old_size = old_stream->Remaining();
 
   if (old_size != header.slen)
     return UNEXPECTED_ERROR;
 
   if (CalculateCrc(old_start, old_size) != header.scrc32)
     return CRC_ERROR;
 
-  MBS_ApplyPatch(&header, patch_stream, old_start, old_size, new_stream);
-
-  return OK;
+  return MBS_ApplyPatch(&header, patch_stream, old_start, old_size, new_stream);
 }
 
 BSDiffStatus ApplyBinaryPatch(base::File old_file,
                               base::File patch_file,
                               base::File new_file) {
   // Set up the old stream.
   base::MemoryMappedFile old_file_mem;
   if (!old_file_mem.Initialize(std::move(old_file))) {
     return READ_ERROR;
   }
@@ skipping 40 matching lines @@
           new_file_path,
           base::File::FLAG_CREATE_ALWAYS |
               base::File::FLAG_WRITE |
               base::File::FLAG_EXCLUSIVE_WRITE));
   if (result != OK)
     base::DeleteFile(new_file_path, false);
   return result;
 }
 
 }  // namespace bsdiff