Commit 799b4802 authored by Hilko Bengen's avatar Hilko Bengen

Update patches

parent 9ea41dbb
From: Hilko Bengen <bengen@debian.org>
Date: Sun, 22 Jan 2017 12:37:03 +0100
Subject: Add missing file from upstream git
---
tests/pyesedb_test_file.py | 135 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 135 insertions(+)
create mode 100644 tests/pyesedb_test_file.py
diff --git a/tests/pyesedb_test_file.py b/tests/pyesedb_test_file.py
new file mode 100644
index 0000000..e4047f9
--- /dev/null
+++ b/tests/pyesedb_test_file.py
@@ -0,0 +1,135 @@
+#!/usr/bin/env python
+#
+# Python-bindings file type test script
+#
+# Copyright (C) 2009-2017, Joachim Metz <joachim.metz@gmail.com>
+#
+# Refer to AUTHORS for acknowledgements.
+#
+# This software is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this software. If not, see <http://www.gnu.org/licenses/>.
+
+import argparse
+import os
+import sys
+import unittest
+
+import pyesedb
+
+
+class FileTypeTests(unittest.TestCase):
+ """Tests the file type."""
+
+ def test_signal_abort(self):
+ """Tests the signal_abort function."""
+ esedb_file = pyesedb.file()
+
+ esedb_file.signal_abort()
+
+ def test_open(self):
+ """Tests the open function."""
+ if not unittest.source:
+ return
+
+ esedb_file = pyesedb.file()
+
+ esedb_file.open(unittest.source)
+
+ with self.assertRaises(IOError):
+ esedb_file.open(unittest.source)
+
+ esedb_file.close()
+
+ with self.assertRaises(TypeError):
+ esedb_file.open(None)
+
+ with self.assertRaises(ValueError):
+ esedb_file.open(unittest.source, mode="w")
+
+ def test_open_file_object(self):
+ """Tests the open_file_object function."""
+ if not unittest.source:
+ return
+
+ file_object = open(unittest.source, "rb")
+
+ esedb_file = pyesedb.file()
+
+ esedb_file.open_file_object(file_object)
+
+ with self.assertRaises(IOError):
+ esedb_file.open_file_object(file_object)
+
+ esedb_file.close()
+
+ # TODO: change IOError into TypeError
+ with self.assertRaises(IOError):
+ esedb_file.open_file_object(None)
+
+ with self.assertRaises(ValueError):
+ esedb_file.open_file_object(file_object, mode="w")
+
+ def test_close(self):
+ """Tests the close function."""
+ if not unittest.source:
+ return
+
+ esedb_file = pyesedb.file()
+
+ with self.assertRaises(IOError):
+ esedb_file.close()
+
+ def test_open_close(self):
+ """Tests the open and close functions."""
+ if not unittest.source:
+ return
+
+ esedb_file = pyesedb.file()
+
+ # Test open and close.
+ esedb_file.open(unittest.source)
+ esedb_file.close()
+
+ # Test open and close a second time to validate clean up on close.
+ esedb_file.open(unittest.source)
+ esedb_file.close()
+
+ file_object = open(unittest.source, "rb")
+
+ # Test open_file_object and close.
+ esedb_file.open_file_object(file_object)
+ esedb_file.close()
+
+ # Test open_file_object and close a second time to validate clean up on close.
+ esedb_file.open_file_object(file_object)
+ esedb_file.close()
+
+ # Test open_file_object and close and dereferencing file_object.
+ esedb_file.open_file_object(file_object)
+ del file_object
+ esedb_file.close()
+
+
+if __name__ == "__main__":
+ argument_parser = argparse.ArgumentParser()
+
+ argument_parser.add_argument(
+ "source", nargs="?", action="store", metavar="PATH",
+ default=None, help="The path of the source file.")
+
+ options, unknown_options = argument_parser.parse_known_args()
+ unknown_options.insert(0, sys.argv[0])
+
+ setattr(unittest, "source", options.source)
+
+ unittest.main(argv=unknown_options, verbosity=2)
From: Joachim Metz <joachim.metz@gmail.com>
Date: Wed, 25 Jan 2017 07:05:08 +0100
Subject: Added bounds check to data segment
---
libesedb/libesedb_data_segment.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/libesedb/libesedb_data_segment.c b/libesedb/libesedb_data_segment.c
index cf1ecf1..931bc77 100644
--- a/libesedb/libesedb_data_segment.c
+++ b/libesedb/libesedb_data_segment.c
@@ -64,6 +64,17 @@ int libesedb_data_segment_initialize(
return( -1 );
}
+ if( data_size > (size_t) SSIZE_MAX )
+ {
+ libcerror_error_set(
+ error,
+ LIBCERROR_ERROR_DOMAIN_ARGUMENTS,
+ LIBCERROR_ARGUMENT_ERROR_VALUE_EXCEEDS_MAXIMUM,
+ "%s: invalid data size value exceeds maximum.",
+ function );
+
+ return( -1 );
+ }
*data_segment = memory_allocate_structure(
libesedb_data_segment_t );
......@@ -7,10 +7,10 @@ Subject: libcpath: Add PATH_MAX for Hurd compatibility
1 file changed, 3 insertions(+)
diff --git a/libcpath/libcpath_path.c b/libcpath/libcpath_path.c
index c5bd75c..4fa4187 100644
index eedda3c..7ea40e5 100644
--- a/libcpath/libcpath_path.c
+++ b/libcpath/libcpath_path.c
@@ -450,6 +450,9 @@ int libcpath_path_get_current_working_directory(
@@ -441,6 +441,9 @@ int libcpath_path_get_current_working_directory(
libcerror_error_t **error )
{
static char *function = "libcpath_path_get_current_working_directory";
......
0001-Add-missing-file-from-upstream-git.patch
0002-Added-bounds-check-to-data-segment.patch
0003-libcpath-Add-PATH_MAX-for-Hurd-compatibility.patch
libcpath-Add-PATH_MAX-for-Hurd-compatibility.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment