aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorted.mielczarek@gmail.com <ted.mielczarek@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e>2013-02-14 14:03:54 +0000
committerted.mielczarek@gmail.com <ted.mielczarek@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e>2013-02-14 14:03:54 +0000
commit24c9dfed8a6ba829080f886c1476bd7b0ac1e11d (patch)
tree89ebb28e8ad5b54cf2b43305bf2fc8a3a8c45f53 /src
parentMake MmapWrapper a little less silly (diff)
downloadbreakpad-24c9dfed8a6ba829080f886c1476bd7b0ac1e11d.tar.xz
size_limit_ member of minidump_descriptor ignored in copy constructor
Patch by Avishai Hendel <avish@fb.com>, R=mkrebs at https://codereview.appspot.com/7305060/ git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1114 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src')
-rw-r--r--src/client/linux/handler/minidump_descriptor.cc4
-rw-r--r--src/client/linux/handler/minidump_descriptor.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/client/linux/handler/minidump_descriptor.cc b/src/client/linux/handler/minidump_descriptor.cc
index 07b70a04..c4618adc 100644
--- a/src/client/linux/handler/minidump_descriptor.cc
+++ b/src/client/linux/handler/minidump_descriptor.cc
@@ -38,7 +38,8 @@ namespace google_breakpad {
MinidumpDescriptor::MinidumpDescriptor(const MinidumpDescriptor& descriptor)
: fd_(descriptor.fd_),
directory_(descriptor.directory_),
- c_path_(NULL) {
+ c_path_(NULL),
+ size_limit_(descriptor.size_limit_) {
// The copy constructor is not allowed to be called on a MinidumpDescriptor
// with a valid path_, as getting its c_path_ would require the heap which
// can cause problems in compromised environments.
@@ -57,6 +58,7 @@ MinidumpDescriptor& MinidumpDescriptor::operator=(
c_path_ = NULL;
UpdatePath();
}
+ size_limit_ = descriptor.size_limit_;
return *this;
}
diff --git a/src/client/linux/handler/minidump_descriptor.h b/src/client/linux/handler/minidump_descriptor.h
index 3036cadb..9ffe622b 100644
--- a/src/client/linux/handler/minidump_descriptor.h
+++ b/src/client/linux/handler/minidump_descriptor.h
@@ -45,7 +45,7 @@ namespace google_breakpad {
class MinidumpDescriptor {
public:
- MinidumpDescriptor() : fd_(-1) {}
+ MinidumpDescriptor() : fd_(-1), size_limit_(-1) {}
explicit MinidumpDescriptor(const string& directory)
: fd_(-1),