aboutsummaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorTatsuya Kinoshita <tats@debian.org>2016-11-21 14:59:14 +0000
committerTatsuya Kinoshita <tats@debian.org>2016-11-21 14:59:14 +0000
commit39ef4b183fdb3f88f4d99fee20129bac2881d086 (patch)
treeb735d82d7c385bd4f870e8db4831ef48180809e6 /debian
parentNew patch 921_cotable.patch to fix null deref (diff)
downloadw3m-39ef4b183fdb3f88f4d99fee20129bac2881d086.tar.gz
w3m-39ef4b183fdb3f88f4d99fee20129bac2881d086.zip
New patch 922_lineproc.patch to fix null deref
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/922_lineproc.patch28
-rw-r--r--debian/patches/series1
2 files changed, 29 insertions, 0 deletions
diff --git a/debian/patches/922_lineproc.patch b/debian/patches/922_lineproc.patch
new file mode 100644
index 0000000..172ea1e
--- /dev/null
+++ b/debian/patches/922_lineproc.patch
@@ -0,0 +1,28 @@
+Subject: Prevent null pointer dereference in HTMLlineproc2body
+Author: Tatsuya Kinoshita <tats@debian.org>
+Bug-Debian: https://github.com/tats/w3m/issues/32
+Origin: https://anonscm.debian.org/cgit/collab-maint/w3m.git/commit/?id=c6c39973e7d336854e9a2d43119d1220b36e2035
+Origin: https://anonscm.debian.org/cgit/collab-maint/w3m.git/commit/?id=a59a35211c63f12951b6266646081b08488b10ea
+
+diff --git a/file.c b/file.c
+index 5be29e7..32ad98a 100644
+--- a/file.c
++++ b/file.c
+@@ -6010,7 +6010,7 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
+ n_textarea = -1;
+ break;
+ case HTML_N_TEXTAREA_INT:
+- if (n_textarea >= 0) {
++ if (a_textarea && n_textarea >= 0) {
+ FormItemList *item =
+ (FormItemList *)a_textarea[n_textarea]->url;
+ item->init_value = item->value =
+@@ -6028,7 +6028,7 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
+ n_select = -1;
+ break;
+ case HTML_N_SELECT_INT:
+- if (n_select >= 0) {
++ if (a_select && n_select >= 0) {
+ FormItemList *item =
+ (FormItemList *)a_select[n_select]->url;
+ item->select_option = select_option[n_select].first;
diff --git a/debian/patches/series b/debian/patches/series
index 425cef0..ed3146a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -57,3 +57,4 @@
919_form-update.patch
920_table.patch
921_cotable.patch
+922_lineproc.patch