From 7b25f7081342804f1a7bcf5300e45598bffc3543 Mon Sep 17 00:00:00 2001
From: Ted Mielczarek <ted@mielczarek.org>
Date: Wed, 17 Feb 2016 06:20:58 -0500
Subject: Fix buffer overrun in MinidumpModule::debug_identifier with
 MDCVInfoELF

---
 src/processor/minidump.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/processor')

diff --git a/src/processor/minidump.cc b/src/processor/minidump.cc
index a9b56a50..90311376 100644
--- a/src/processor/minidump.cc
+++ b/src/processor/minidump.cc
@@ -47,6 +47,7 @@
 #include <unistd.h>
 #endif  // _WIN32
 
+#include <algorithm>
 #include <fstream>
 #include <iostream>
 #include <limits>
@@ -2054,7 +2055,8 @@ string MinidumpModule::debug_identifier() const {
       // The full build id is available by calling code_identifier.
       MDGUID guid = {0};
       memcpy(&guid, &cv_record_elf->build_id,
-             cv_record_->size() - MDCVInfoELF_minsize);
+             std::min(cv_record_->size() - MDCVInfoELF_minsize,
+                      sizeof(MDGUID)));
       identifier = guid_and_age_to_debug_id(guid, 0);
     }
   }
-- 
cgit v1.2.1