created tag 3.48.11

* closes:46

-Cette ligne, et les suivantes ci-dessous, seront ignorées--

M    trunk/src/htscore.c

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for httrack 3.48.10.
+# Generated by GNU Autoconf 2.69 for httrack 3.48.11.
 #
 # Report bugs to <roche+packaging@httrack.com>.
 #
@@ -616,8 +616,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='httrack'
 PACKAGE_TARNAME='httrack'
-PACKAGE_VERSION='3.48.10'
-PACKAGE_STRING='httrack 3.48.10'
+PACKAGE_VERSION='3.48.11'
+PACKAGE_STRING='httrack 3.48.11'
 PACKAGE_BUGREPORT='roche+packaging@httrack.com'
 PACKAGE_URL='http://www.httrack.com/'
 
@@ -1356,7 +1356,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 httrack 3.48.10 to adapt to many kinds of systems.
+\`configure' configures httrack 3.48.11 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1426,7 +1426,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of httrack 3.48.10:";;
+     short | recursive ) echo "Configuration of httrack 3.48.11:";;
    esac
   cat <<\_ACEOF
 
@@ -1537,7 +1537,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-httrack configure 3.48.10
+httrack configure 3.48.11
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2169,7 +2169,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 httrack $as_me 3.48.10, which was
+It was created by httrack $as_me 3.48.11, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2990,7 +2990,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='httrack'
- VERSION='3.48.10'
+ VERSION='3.48.11'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13760,7 +13760,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by httrack $as_me 3.48.10, which was
+This file was extended by httrack $as_me 3.48.11, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13827,7 +13827,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-httrack config.status 3.48.10
+httrack config.status 3.48.11
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,6 +1,6 @@
 AC_PREREQ(2.59)
 
-AC_INIT([httrack], [3.48.10], [roche+packaging@httrack.com], [httrack], [http://www.httrack.com/])
+AC_INIT([httrack], [3.48.11], [roche+packaging@httrack.com], [httrack], [http://www.httrack.com/])
 AC_COPYRIGHT([
 HTTrack Website Copier, Offline Browser for Windows and Unix
 Copyright (C) 1998-2014 Xavier Roche and other contributors

debian/changelog

@@ -1,4 +1,10 @@
-httrack (3.48.10) unstable; urgency=low
+httrack (3.48.11-1) unstable; urgency=low
+
+  * Updated to 3.48.11 (3.48-11)
+
+ -- Xavier Roche <xavier@debian.org>  Fri, 06 Jun 2014 17:58:12 +0200
+
+httrack (3.48.10-1) unstable; urgency=low
 
   * Updated to 3.48.10 (3.48-10)
 

history.txt

@@ -4,12 +4,13 @@ HTTrack Website Copier release history:
 
 This file lists all changes and fixes that have been made for HTTrack.
 
-3.48-10
+3.48-11
++ Fixed: assertion failure at htscore.c:244 (len + liensbuf->string_buffer_size < liensbuf->string_buffer_capa)
 + Fixed: injection-proof templates
 + Fixed: htshash.c:330 assertion failure ("error invalidating hash entry") (Sergey)
 + Fixed: Windows 2000 regression (fantozzi.usenet)
 + Fixed: code cleanup (aliasing issues, const correctness, safe strings)
-+ New: handle --max-links 0 to disable maximum link limits
++ New: handle --advanced-maxlinks=0 to disable maximum link limits
 + New: updated ZIP routines (zlib 1.2.8)
 + Fixed: broken 32-bit version
 + Fixed: assertion "segOutputSize < segSize assertion fails at htscharset.c:993"

src/Makefile.am

@@ -8,8 +8,11 @@ DevIncludes_DATA = \
 	../config.h \
 	htsmodules.h \
 	htsbasenet.h \
+	htsnet.h \
 	htsbauth.h \
-	htsdefines.h
+	htsdefines.h \
+	htsstrings.h \
+	htssafe.h
 
 INCLUDES = \
 	@DEFAULT_CFLAGS@ \

src/Makefile.in

@@ -319,8 +319,11 @@ DevIncludes_DATA = \
 	../config.h \
 	htsmodules.h \
 	htsbasenet.h \
+	htsnet.h \
 	htsbauth.h \
-	htsdefines.h
+	htsdefines.h \
+	htsstrings.h \
+	htssafe.h
 
 INCLUDES = \
 	@DEFAULT_CFLAGS@ \

src/htscore.c

@@ -222,6 +222,7 @@ static char* hts_record_link_strdup_(httrackp *opt, const char *s) {
   char *s_dup;
 
   assertf(liensbuf != NULL);
+  assertf(len < block_capa);
 
   // not enough capacity ? then create a new chunk
   if (len + liensbuf->string_buffer_size > liensbuf->string_buffer_capa) {
@@ -241,7 +242,7 @@ static char* hts_record_link_strdup_(httrackp *opt, const char *s) {
     liensbuf->string_buffer_size = 0;
   }
 
-  assertf(len + liensbuf->string_buffer_size < liensbuf->string_buffer_capa);
+  assertf(len + liensbuf->string_buffer_size <= liensbuf->string_buffer_capa);
   s_dup = &liensbuf->string_buffer[liensbuf->string_buffer_size];
   memcpy(s_dup, s, len);
   liensbuf->string_buffer_size += len;

src/htsentities.sh

@@ -56,7 +56,7 @@ EOF
                 i=$[${i}+1]
             done
             echo -e "    /* $A */"
-            echo -e "  case ${hash}:"
+            echo -e "  case ${hash}u:"
             echo -e "    if (len == ${#ent} /* && strncmp(ent, \"${ent}\") == 0 */) {"
             echo -e "      return ${code};"
             echo -e "    }"

src/htsglobal.h

@@ -36,8 +36,8 @@ Please visit our Website: http://www.httrack.com
 #define HTTRACK_GLOBAL_DEFH
 
 // Version (also check external version information)
-#define HTTRACK_VERSION      "3.48-10"
-#define HTTRACK_VERSIONID    "3.48.10"
+#define HTTRACK_VERSION      "3.48-11"
+#define HTTRACK_VERSIONID    "3.48.11"
 #define HTTRACK_AFF_VERSION  "3.x"
 #define HTTRACK_LIB_VERSION  "2.0"