Fix bug in xd3_merge_add(), calling memcpy with wrong offset and size.

1 files changed, 29 insertions, 13 deletions

diff --git a/xdelta3/testing/file.h b/xdelta3/testing/file.h
index a0231be..30a8428 100644
--- a/xdelta3/testing/file.h
+++ b/xdelta3/testing/file.h
@@ -217,42 +217,58 @@ private:
   size_t blksize_;
 };
 
-class TmpFile {
+class ExtFile {
 public:
-  // TODO this is a little unportable!
-  TmpFile() {
+  ExtFile() {
     static int static_counter = 0;
     char buf[32];
     snprintf(buf, 32, "/tmp/regtest.%d", static_counter++);
     filename_.append(buf);
     unlink(filename_.c_str());
+  }
+
+  ~ExtFile() {
+    unlink(filename_.c_str());
+  }
+
+  const char* Name() const {
+    return filename_.c_str();
+  }
+
+  // Check whether a real file matches a file spec.
+  bool EqualsSpec(const FileSpec &spec) const;
+
+protected:
+  string filename_;
+};
+
+class TmpFile : public ExtFile {
+public:
+  // TODO this is a little unportable!
+  TmpFile() {
     main_file_init(&file_);
+    CHECK_EQ(0, main_file_open(&file_, filename_.c_str(), XO_WRITE));
   }
 
   ~TmpFile() {
-    unlink(filename_.c_str());
     main_file_cleanup(&file_);
   }
 
   void Append(const Block *block) {
-    if (!main_file_isopen(&file_)) {
-      CHECK_EQ(0, main_file_open(&file_, filename_.c_str(), XO_WRITE));
-    }
     CHECK_EQ(0, main_file_write(&file_, 
                                 block->Data(), block->Size(), 
                                 "tmpfile write failed"));
   }
 
+
   const char* Name() const {
-    CHECK_EQ(0, main_file_close(&file_));
-    return filename_.c_str();
+    if (main_file_isopen(&file_)) {
+      CHECK_EQ(0, main_file_close(&file_));
+    }
+    return ExtFile::Name();
   }
 
-  // Check whether a real file matches a file spec.
-  bool EqualsSpec(const FileSpec &spec) const;
-
 private:
-  string filename_;
   mutable main_file file_;
 };