storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #202 from bptato/dl

Browse Source 
Fix stack overflow due to closing dd tags
This commit is contained in:
Tatsuya Kinoshita
2021-10-27 00:39:28 +09:00
committed by GitHub
parent 7f8b4f9fcd fa02254a6a
commit f46aa6769f
1 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
file.c
+5 -18
View File
@@ -4649,6 +4649,7 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env)
case HTML_N_OL: case HTML_N_OL:
case HTML_N_DL: case HTML_N_DL:
case HTML_N_BLQ: case HTML_N_BLQ:
case HTML_N_DD:
CLOSE_DT; CLOSE_DT;
CLOSE_A; CLOSE_A;
if (h_env->envc > 0) { if (h_env->envc > 0) {
@@ -4796,17 +4797,12 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env)
case HTML_DD: case HTML_DD:
CLOSE_A; CLOSE_A;
CLOSE_DT; CLOSE_DT;
if (h_env->envc == 0 || if (envs[h_env->envc].env == HTML_DL ||
(h_env->envc_real < h_env->nenv && envs[h_env->envc].env == HTML_DL_COMPACT) {
envs[h_env->envc].env != HTML_DL && PUSH_ENV(HTML_DD);
envs[h_env->envc].env != HTML_DL_COMPACT)) {
PUSH_ENV(HTML_DL);
} }
if (h_env->envc <= MAX_INDENT_LEVEL) if (h_env->envc > 0 && envs[h_env->envc - 1].env == HTML_DL_COMPACT) {
envs[h_env->envc].indent = envs[h_env->envc - 1].indent + INDENT_INCR;
if (envs[h_env->envc].env == HTML_DL_COMPACT) {
if (obuf->pos > envs[h_env->envc].indent) if (obuf->pos > envs[h_env->envc].indent)
flushline(h_env, obuf, envs[h_env->envc].indent, 0, flushline(h_env, obuf, envs[h_env->envc].indent, 0,
h_env->limit); h_env->limit);
@@ -4817,15 +4813,6 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env)
flushline(h_env, obuf, envs[h_env->envc].indent, 0, h_env->limit); flushline(h_env, obuf, envs[h_env->envc].indent, 0, h_env->limit);
/* obuf->flag |= RB_IGNORE_P; */ /* obuf->flag |= RB_IGNORE_P; */
return 1; return 1;
case HTML_N_DD:
if (h_env->envc == 0 ||
(h_env->envc_real < h_env->nenv &&
envs[h_env->envc].env != HTML_DL &&
envs[h_env->envc].env != HTML_DL_COMPACT))
return 1;
envs[h_env->envc].indent = envs[h_env->envc].indent - INDENT_INCR;
flushline(h_env, obuf, envs[h_env->envc].indent, 0, h_env->limit);
return 1;
case HTML_TITLE: case HTML_TITLE:
close_anchor(h_env, obuf); close_anchor(h_env, obuf);
process_title(tag); process_title(tag);