[Forensics-changes] [SCM] debian-forensics/libewf branch, debian, updated. debian/20091224-1
Cristian Greco
cristian at regolo.cc
Sat Jan 9 11:12:16 UTC 2010
The following commit has been merged in the debian branch:
commit b4a86f433c822a83ef9bdc9eb0387fbcf871670c
Author: Cristian Greco <cristian at regolo.cc>
Date: Fri Jan 8 13:47:39 2010 +0100
Imported Upstream version 20091224
diff --git a/ChangeLog b/ChangeLog
index 568b8ad..b513b0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -202,6 +202,10 @@ Beta after next stable release
* check into resume write error for 32-bit compile
* check make distclean
+20091224
+* correction of return value of several ree functions
+* applied multi header patch
+
20091114
* moved codepage definitions to libewf_codepage.h
* updated libbfio
diff --git a/common/config.h b/common/config.h
index 57a0b8a..04ac949 100644
--- a/common/config.h
+++ b/common/config.h
@@ -423,13 +423,13 @@
#define PACKAGE_NAME "libewf"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libewf 20091128"
+#define PACKAGE_STRING "libewf 20091224"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "libewf"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "20091128"
+#define PACKAGE_VERSION "20091224"
/* The size of `off_t', as computed by sizeof. */
#define SIZEOF_OFF_T 8
@@ -453,7 +453,7 @@
/* #undef TM_IN_SYS_TIME */
/* Version number of package */
-#define VERSION "20091128"
+#define VERSION "20091224"
/* Number of bits in a file offset, on hosts where this is settable. */
/* #undef _FILE_OFFSET_BITS */
diff --git a/configure b/configure
index 58f19d2..94e9645 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for libewf 20091128.
+# Generated by GNU Autoconf 2.63 for libewf 20091224.
#
# Report bugs to <forensics at hoffmannbv.nl>.
#
@@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='libewf'
PACKAGE_TARNAME='libewf'
-PACKAGE_VERSION='20091128'
-PACKAGE_STRING='libewf 20091128'
+PACKAGE_VERSION='20091224'
+PACKAGE_STRING='libewf 20091224'
PACKAGE_BUGREPORT='forensics at hoffmannbv.nl'
ac_unique_file="include/libewf.h.in"
@@ -1537,7 +1537,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libewf 20091128 to adapt to many kinds of systems.
+\`configure' configures libewf 20091224 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1607,7 +1607,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libewf 20091128:";;
+ short | recursive ) echo "Configuration of libewf 20091224:";;
esac
cat <<\_ACEOF
@@ -1721,7 +1721,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libewf configure 20091128
+libewf configure 20091224
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1735,7 +1735,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libewf $as_me 20091128, which was
+It was created by libewf $as_me 20091224, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2587,7 +2587,7 @@ fi
# Define the identity of the package.
PACKAGE=libewf
- VERSION=20091128
+ VERSION=20091224
cat >>confdefs.h <<_ACEOF
@@ -38114,7 +38114,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libewf $as_me 20091128, which was
+This file was extended by libewf $as_me 20091224, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -38177,7 +38177,7 @@ Report bugs to <bug-autoconf at gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-libewf config.status 20091128
+libewf config.status 20091224
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index ea3f62c..4a5cec5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ( 2.59 )
AC_INIT(
[libewf],
- [20091128],
+ [20091224],
[forensics at hoffmannbv.nl])
AC_CONFIG_SRCDIR(
@@ -10,7 +10,7 @@ AC_CONFIG_SRCDIR(
AM_INIT_AUTOMAKE(
[libewf],
- [20091128])
+ [20091224])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/include/libewf/definitions.h b/include/libewf/definitions.h
index 0a906c2..3b0b49a 100644
--- a/include/libewf/definitions.h
+++ b/include/libewf/definitions.h
@@ -25,11 +25,11 @@
#include <libewf/types.h>
-#define LIBEWF_VERSION 20091128
+#define LIBEWF_VERSION 20091224
/* The libewf version string
*/
-#define LIBEWF_VERSION_STRING "20091128"
+#define LIBEWF_VERSION_STRING "20091224"
/* The libewf file access
* bit 1 set to 1 for read access
diff --git a/libewf.pc b/libewf.pc
index 39a44da..e41fae7 100644
--- a/libewf.pc
+++ b/libewf.pc
@@ -5,7 +5,7 @@ includedir=${prefix}/include
Name: libewf
Description: Library to support the Expert Witness Compression Format (EWF)
-Version: 20091128
+Version: 20091224
Libs: -L${libdir} -lewf
Libs.private: -lz
Cflags: -I${includedir}
diff --git a/libewf.spec b/libewf.spec
index 6528830..288da67 100644
--- a/libewf.spec
+++ b/libewf.spec
@@ -1,5 +1,5 @@
Name: libewf
-Version: 20091128
+Version: 20091224
Release: 1
Summary: Library to support the Expert Witness Compression Format
Group: System Environment/Libraries
diff --git a/libewf/libewf_definitions.h b/libewf/libewf_definitions.h
index d1df08a..51d3ad7 100644
--- a/libewf/libewf_definitions.h
+++ b/libewf/libewf_definitions.h
@@ -37,11 +37,11 @@
#include <libewf/definitions.h>
#else
-#define LIBEWF_VERSION 20091128
+#define LIBEWF_VERSION 20091224
/* The libewf version string
*/
-#define LIBEWF_VERSION_STRING "20091128"
+#define LIBEWF_VERSION_STRING "20091224"
/* The libewf file access
* bit 1 set to 1 for read access
diff --git a/libewf/libewf_handle.c b/libewf/libewf_handle.c
index 0f229db..2f0055f 100644
--- a/libewf/libewf_handle.c
+++ b/libewf/libewf_handle.c
@@ -597,7 +597,7 @@ int libewf_handle_free(
*handle = NULL;
}
- return( 1 );
+ return( result );
}
/* Signals the libewf handle to abort its current activity
diff --git a/libewf/libewf_io_handle.c b/libewf/libewf_io_handle.c
index fd4cc3e..ada6e57 100644
--- a/libewf/libewf_io_handle.c
+++ b/libewf/libewf_io_handle.c
@@ -102,6 +102,7 @@ int libewf_io_handle_free(
liberror_error_t **error )
{
static char *function = "libewf_io_handle_free";
+ int result = 1;
if( io_handle == NULL )
{
@@ -128,12 +129,14 @@ int libewf_io_handle_free(
LIBERROR_RUNTIME_ERROR_FINALIZE_FAILED,
"%s: unable to free file io pool.",
function );
+
+ result = -1;
}
memory_free(
*io_handle );
*io_handle = NULL;
}
- return( 1 );
+ return( result );
}
diff --git a/libewf/libewf_legacy.c b/libewf/libewf_legacy.c
index 6a2d2be..034dcde 100644
--- a/libewf/libewf_legacy.c
+++ b/libewf/libewf_legacy.c
@@ -2741,11 +2741,14 @@ int libewf_get_amount_of_header_values(
{
liberror_error_t *error = NULL;
static char *function = "libewf_get_amount_of_header_values";
+ int result = 0;
- if( libewf_handle_get_amount_of_header_values(
- handle,
- amount_of_values,
- &error ) != 1 )
+ result = libewf_handle_get_amount_of_header_values(
+ handle,
+ amount_of_values,
+ &error );
+
+ if( result == -1 )
{
liberror_error_set(
&error,
@@ -2761,7 +2764,7 @@ int libewf_get_amount_of_header_values(
return( -1 );
}
- return( 1 );
+ return( result );
}
/* Retrieves the header value identifier size specified by its index
diff --git a/libewf/libewf_metadata.c b/libewf/libewf_metadata.c
index 41ce799..989dfc8 100644
--- a/libewf/libewf_metadata.c
+++ b/libewf/libewf_metadata.c
@@ -3313,7 +3313,9 @@ int libewf_handle_parse_header_values(
liberror_error_t **error )
{
static char *function = "libewf_handle_parse_header_values";
- int result = 1;
+ int result_header = 1;
+ int result_header2 = 1;
+ int result_xheader = 1;
if( internal_handle == NULL )
{
@@ -3387,7 +3389,7 @@ int libewf_handle_parse_header_values(
"%s: unable to parse header.",
function );
- result = -1;
+ result_header = -1;
}
if( ( internal_handle->header_sections->header2 != NULL )
&& ( libewf_header_values_parse_header2(
@@ -3403,7 +3405,7 @@ int libewf_handle_parse_header_values(
"%s: unable to parse header2.",
function );
- result = -1;
+ result_header2 = -1;
}
if( ( internal_handle->header_sections->xheader != NULL )
&& ( libewf_header_values_parse_xheader(
@@ -3419,12 +3421,21 @@ int libewf_handle_parse_header_values(
"%s: unable to parse xheader.",
function );
- result = -1;
+ result_xheader = -1;
}
- if( result != 1 )
+ if( ( result_header != 1 )
+ && ( result_header2 != 1 )
+ && ( result_xheader != 1 ) )
{
return( -1 );
}
+ if( ( result_header != 1 )
+ || ( result_header2 != 1 )
+ || ( result_xheader != 1 ) )
+ {
+ liberror_error_free(
+ error );
+ }
/* The EnCase2 and EnCase3 format are the same
* only the acquiry software version provides insight in which version of EnCase was used
*/
diff --git a/libewf/libewf_read_io_handle.c b/libewf/libewf_read_io_handle.c
index fada34a..ff7e08d 100644
--- a/libewf/libewf_read_io_handle.c
+++ b/libewf/libewf_read_io_handle.c
@@ -127,6 +127,7 @@ int libewf_read_io_handle_free(
liberror_error_t **error )
{
static char *function = "libewf_read_io_handle_free";
+ int result = 1;
if( read_io_handle == NULL )
{
@@ -151,13 +152,15 @@ int libewf_read_io_handle_free(
LIBERROR_RUNTIME_ERROR_FINALIZE_FAILED,
"%s: unable to free crc errors.",
function );
+
+ result = -1;
}
memory_free(
*read_io_handle );
*read_io_handle = NULL;
}
- return( 1 );
+ return( result );
}
/* Processes the chunk data, applies decompression if necessary and validates the CRC
diff --git a/libewf/libewf_segment_file.c b/libewf/libewf_segment_file.c
index a370d8f..dc1ab1d 100644
--- a/libewf/libewf_segment_file.c
+++ b/libewf/libewf_segment_file.c
@@ -84,10 +84,8 @@ ssize_t libewf_segment_file_read_file_header(
}
#if defined( HAVE_DEBUG_OUTPUT )
libnotify_verbose_printf(
- "%s: reading file header at offset: %" PRIu64 " (0x%08" PRIx64 ")\n",
- function,
- 0,
- 0 );
+ "%s: reading file header at offset: 0 (0x00000000)\n",
+ function );
#endif
if( libbfio_pool_seek_offset(
diff --git a/libewf/libewf_segment_file_handle.c b/libewf/libewf_segment_file_handle.c
index 1691716..ef769b8 100644
--- a/libewf/libewf_segment_file_handle.c
+++ b/libewf/libewf_segment_file_handle.c
@@ -140,6 +140,7 @@ int libewf_segment_file_handle_free(
liberror_error_t **error )
{
static char *function = "libewf_segment_file_handle_free";
+ int result = 1;
if( segment_file_handle == NULL )
{
@@ -167,6 +168,8 @@ int libewf_segment_file_handle_free(
LIBERROR_RUNTIME_ERROR_FINALIZE_FAILED,
"%s: unable to free section list.",
function );
+
+ result = -1;
}
}
memory_free(
@@ -174,6 +177,6 @@ int libewf_segment_file_handle_free(
*segment_file_handle = NULL;
}
- return( 1 );
+ return( result );
}
diff --git a/libewf/libewf_segment_table.c b/libewf/libewf_segment_table.c
index 8da921d..03128ed 100644
--- a/libewf/libewf_segment_table.c
+++ b/libewf/libewf_segment_table.c
@@ -174,6 +174,7 @@ int libewf_segment_table_free(
{
static char *function = "libewf_segment_table_free";
uint16_t segment_table_iterator = 0;
+ int result = 1;
if( segment_table == NULL )
{
@@ -201,6 +202,8 @@ int libewf_segment_table_free(
"%s: unable to free segment file handle: %" PRIu16 ".",
function,
segment_table_iterator + 1 );
+
+ result = -1;
}
}
memory_free(
@@ -216,7 +219,7 @@ int libewf_segment_table_free(
*segment_table = NULL;
}
- return( 1 );
+ return( result );
}
/* Resizes the segment table
diff --git a/macosx/Introduction.rtf b/macosx/Introduction.rtf
index 773a821..14e5291 100644
--- a/macosx/Introduction.rtf
+++ b/macosx/Introduction.rtf
@@ -4,4 +4,4 @@
\margl1440\margr1440\vieww9880\viewh13400\viewkind0
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-\f0\fs24 \cf0 This will install a universal build of libewf 20091128 and the ewftools.}
+\f0\fs24 \cf0 This will install a universal build of libewf 20091224 and the ewftools.}
--
debian-forensics/libewf
More information about the forensics-changes
mailing list