refixed buffer overflow

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 8eee7ad1f631854cb4a4857f8b2cade9244b9f27..65f23951b93c03b17007d5a912d862c8879aeb61 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2004-12-08 [hoa]       0.9.13cvs8
+
+       * src/quote_fmt_parse.y
+               really fix buffer overflow
+

 2004-12-08 [colin]     0.9.13cvs7
 
        * src/matcher_parser_parse.y
 2004-12-08 [colin]     0.9.13cvs7
 
        * src/matcher_parser_parse.y

diff --git a/configure.ac b/configure.ac
index 212109a3a8ce10b9aef2ebf80e98231192b72ac9..3a34fa33ccba35cb50b0d14eac228323c0c5f1e5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=7
+EXTRA_VERSION=8

 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/quote_fmt_parse.y b/src/quote_fmt_parse.y
index bdbcd7aac6c80a7630b08841446bcd8e0d46887e..a28647fb5e948278eebc07d9d1a61fc0c5b84546 100644 (file)
--- a/src/quote_fmt_parse.y
+++ b/src/quote_fmt_parse.y
@@ -205,12 +205,12 @@ string:
                int len;
                
                strncpy($$, $1, sizeof($$));
                int len;
                
                strncpy($$, $1, sizeof($$));

+               $$[sizeof($$) - 1] = '\0';

                len = strlen($$);
                if (len + 1 < sizeof($$)) {
                        $$[len + 1] = '\0';
                        $$[len] = $2;
                }
                len = strlen($$);
                if (len + 1 < sizeof($$)) {
                        $$[len + 1] = '\0';
                        $$[len] = $2;
                }

-               $$[sizeof($$) - 1] = '\0';

        };
 
 special:
        };
 
 special: