commit f572845d04c579e81b2dc78e8efeea12dc7dbee7
author cushon <cushon@google.com> Wed Mar 21 20:30:12 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Wed Mar 21 20:32:06 2018 -0700
tree 068525bf67cfaec5ed1c4d384b9de7dd0c0b0da5
parent 2410e1ab3e035382abe519003c618271a69a7b8e

Include manifest size when presizing ijar output

PiperOrigin-RevId: 190010996

third_party/ijar/mapped_file_unix.cc

diff --git a/third_party/ijar/mapped_file_unix.cc b/third_party/ijar/mapped_file_unix.cc
index d5a0b57..ccb8787 100644
--- a/third_party/ijar/mapped_file_unix.cc
+++ b/third_party/ijar/mapped_file_unix.cc
@@ -90,7 +90,8 @@
   int mmap_length_;
 };
 
-MappedOutputFile::MappedOutputFile(const char* name, u8 estimated_size) {
+MappedOutputFile::MappedOutputFile(const char* name, u8 estimated_size)
+    : estimated_size_(estimated_size) {
   impl_ = NULL;
   opened_ = false;
   int fd = open(name, O_CREAT|O_RDWR|O_TRUNC, 0644);
@@ -131,6 +132,12 @@
 }
 
 int MappedOutputFile::Close(int size) {
+  if (size > estimated_size_) {
+    snprintf(errmsg, MAX_ERROR, "size %d > estimated size %lld", size,
+             estimated_size_);
+    errmsg_ = errmsg;
+    return -1;
+  }
   munmap(buffer_, impl_->mmap_length_);
   if (ftruncate(impl_->fd_, size) < 0) {
     snprintf(errmsg, MAX_ERROR, "ftruncate(): %s", strerror(errno));