diff options
| author | Tatsuya Kinoshita <tats@debian.org> | 2013-08-04 07:44:17 +0000 |
|---|---|---|
| committer | Tatsuya Kinoshita <tats@debian.org> | 2013-08-04 07:44:17 +0000 |
| commit | de74188e37b32fd7e2fa3db050117ac7d1e6c259 (patch) | |
| tree | 85d5d834d1961a670964c4884e31edda6450ead0 | |
| parent | New patch 180_execdict.patch to fix potentially segfault (diff) | |
| download | w3m-de74188e37b32fd7e2fa3db050117ac7d1e6c259.tar.gz w3m-de74188e37b32fd7e2fa3db050117ac7d1e6c259.zip | |
New patch 190_Strchop.patch to fix potentially segfault
| -rw-r--r-- | debian/patches/190_Strchop.patch | 16 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 17 insertions, 0 deletions
diff --git a/debian/patches/190_Strchop.patch b/debian/patches/190_Strchop.patch new file mode 100644 index 0000000..e27861f --- /dev/null +++ b/debian/patches/190_Strchop.patch @@ -0,0 +1,16 @@ +Subject: Check length for Strchop() +From: Tatsuya Kinoshita <tats@debian.org> + +--- a/Str.c ++++ b/Str.c +@@ -278,8 +278,8 @@ void + Strchop(Str s) + { + STR_LENGTH_CHECK(s); +- while ((s->ptr[s->length - 1] == '\n' || s->ptr[s->length - 1] == '\r') && +- s->length > 0) { ++ while (s->length > 0 && ++ (s->ptr[s->length - 1] == '\n' || s->ptr[s->length - 1] == '\r')) { + s->length--; + } + s->ptr[s->length] = '\0'; diff --git a/debian/patches/series b/debian/patches/series index 8a7fe4f..71b3727 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -17,3 +17,4 @@ 160_ignore-shy.patch 170_w3mman2html-utf8.patch 180_execdict.patch +190_Strchop.patch |