- Dillo-dev - lists.mailman3.com

[bug]: CSS image crash

by onepoint＠starurchin.org

Johannes Hofmann wrote: > Just for the record, normally it's better to make general changes > and bugfixes to the main branch and merge them into development > branches. "main" being FLTK 2.0 and "development" being FLTK 1.3, is that right? Who is responsible for merging changes into development? So far I have been thinking only about the 2.0 branch and treating 1.3 as someone else's problem. Is that fair or should I be checking that my changes merge into the 1.3 bramnch too? Regards, Jeremy Henty

March 27, 2011

[bug]: CSS image crash

by Johannes.Hofmann＠gmx.de

On Sun, Mar 27, 2011 at 10:30:10AM +0100, Jeremy Henty wrote: > Jorge Arellano Cid wrote: > > On Sat, Mar 26, 2011 at 09:30:37AM +0000, Jeremy Henty wrote: > > > > > > So how do we fix 2.0? With my latest patch? Or should we port > > > yours from 1.3 to 2.0? > > > > From a quick review they're the same. > > The one you posted surely applies cleanly to 2.0. > > Just commit it. > > OK, it's done. Just for the record, normally it's better to make general changes and bugfixes to the main branch and merge them into development branches. But for simple stuff like this it doesn't really matter. Cheers, Johannes

March 27, 2011

[bug]: '<META HTTP-EQUIV="Expires" CONTENT="-1">' => endless calls to Nav_open_url()

by onepoint＠starurchin.org

Jeremy Henty wrote: > > corvid wrote: > > > Probably reads the 0.1 as 0 and does the same bad thing we usually > > get when we have 0 and don't have a URL argument sending us > > somewhere else... > > So the bug is that Html_tag_open_meta() does not check that it has > found a URL before doing the redirect? Does the attached patch look > sensible? (The patch is a little messy, but all it does is wrap the > redirect code in a "if (*content) { ... }".) Bump. Is this patch OK? Regards, Jeremy Henty > # HG changeset patch > # Parent f3e1b0b004c5748988a344d68b80807495ef55d2 > html.cc: Html_tag_open_meta(): check that the URL exists before redirecting. > > > diff -r f3e1b0b004c5 -r 1fb8f2b486fa src/html.cc > --- a/src/html.cc Sat Jan 08 17:56:56 2011 +0000 > +++ b/src/html.cc Mon Mar 21 07:49:47 2011 +0000 > @@ -2868,42 +2868,45 @@ > } > /* Skip to anything after "URL=" */ > while (*content && *(content++) != '=') ; > - /* Handle the case of a quoted URL */ > - if (*content == '"' || *content == '\'') { > - if ((p = strchr(content + 1, *content))) > - mr_url = dStrndup(content + 1, p - content - 1); > - else > - mr_url = dStrdup(content + 1); > - } else { > - mr_url = dStrdup(content); > + if (*content) { > + > + /* Handle the case of a quoted URL */ > + if (*content == '"' || *content == '\'') { > + if ((p = strchr(content + 1, *content))) > + mr_url = dStrndup(content + 1, p - content - 1); > + else > + mr_url = dStrdup(content + 1); > + } else { > + mr_url = dStrdup(content); > + } > + > + if (delay == 0) { > + /* zero-delay redirection */ > + html->stop_parser = true; > + DilloUrl *new_url = a_Url_new(mr_url, URL_STR(html->base_url)); > + if (a_Capi_dpi_verify_request(html->bw, new_url)) > + a_UIcmd_redirection0((void*)html->bw, new_url); > + a_Url_free(new_url); > + } else { > + /* Send a custom HTML message. > + * TODO: This is a hairy hack, > + * It'd be much better to build a widget. */ > + Dstr *ds_msg = dStr_sized_new(256); > + dStr_sprintf(ds_msg, meta_template, mr_url, delay_str); > + { > + int o_InFlags = html->InFlags; > + int o_TagSoup = html->TagSoup; > + html->InFlags = IN_BODY; > + html->TagSoup = false; > + Html_write_raw(html, ds_msg->str, ds_msg->len, 0); > + html->TagSoup = o_TagSoup; > + html->InFlags = o_InFlags; > + } > + dStr_free(ds_msg, 1); > + } > + dFree(mr_url); > } > > - if (delay == 0) { > - /* zero-delay redirection */ > - html->stop_parser = true; > - DilloUrl *new_url = a_Url_new(mr_url, URL_STR(html->base_url)); > - if (a_Capi_dpi_verify_request(html->bw, new_url)) > - a_UIcmd_redirection0((void*)html->bw, new_url); > - a_Url_free(new_url); > - } else { > - /* Send a custom HTML message. > - * TODO: This is a hairy hack, > - * It'd be much better to build a widget. */ > - Dstr *ds_msg = dStr_sized_new(256); > - dStr_sprintf(ds_msg, meta_template, mr_url, delay_str); > - { > - int o_InFlags = html->InFlags; > - int o_TagSoup = html->TagSoup; > - html->InFlags = IN_BODY; > - html->TagSoup = false; > - Html_write_raw(html, ds_msg->str, ds_msg->len, 0); > - html->TagSoup = o_TagSoup; > - html->InFlags = o_InFlags; > - } > - dStr_free(ds_msg, 1); > - } > - dFree(mr_url); > - > } else if (!dStrcasecmp(equiv, "content-type") && > (content = a_Html_get_attr(html, tag, tagsize, "content"))) { > _MSG("Html_tag_open_meta: content={%s}\n", content); > _______________________________________________ > Dillo-dev mailing list > Dillo-dev(a)dillo.org > http://lists.auriga.wearlab.de/cgi-bin/mailman/listinfo/dillo-dev

March 27, 2011

[bug]: CSS image crash

by onepoint＠starurchin.org

Jorge Arellano Cid wrote: > On Sat, Mar 26, 2011 at 09:30:37AM +0000, Jeremy Henty wrote: > > > > So how do we fix 2.0? With my latest patch? Or should we port > > yours from 1.3 to 2.0? > > From a quick review they're the same. > The one you posted surely applies cleanly to 2.0. > Just commit it. OK, it's done. Regards, Jeremy Henty

March 27, 2011

[bug]: CSS image crash

by jcid＠dillo.org

On Sat, Mar 26, 2011 at 09:30:37AM +0000, Jeremy Henty wrote: > Jorge Arellano Cid wrote: > > On Fri, Mar 25, 2011 at 06:12:48PM +0000, Jeremy Henty wrote: > > > > > > Jorge Arellano Cid wrote: > > > > > > > Patch committed (just typos). > > > > > > Is it pushed? I just did a pull and got nothing newer than a > > > commit from corvid on Feb 11th. > > > > Yes, in the 1.3 branch. > > So how do we fix 2.0? With my latest patch? Or should we port yours > from 1.3 to 2.0? From a quick review they're the same. The one you posted surely applies cleanly to 2.0. Just commit it. -- Cheers Jorge.-

March 26, 2011

[bug]: CSS image crash

by onepoint＠starurchin.org

Jorge Arellano Cid wrote: > On Fri, Mar 25, 2011 at 06:12:48PM +0000, Jeremy Henty wrote: > > > > Jorge Arellano Cid wrote: > > > > > Patch committed (just typos). > > > > Is it pushed? I just did a pull and got nothing newer than a > > commit from corvid on Feb 11th. > > Yes, in the 1.3 branch. So how do we fix 2.0? With my latest patch? Or should we port yours from 1.3 to 2.0? Regards, Jeremy Henty

March 26, 2011

[bug]: CSS image crash

by jcid＠dillo.org

On Fri, Mar 25, 2011 at 06:12:48PM +0000, Jeremy Henty wrote: > > Jorge Arellano Cid wrote: > > > Patch committed (just typos). > > Is it pushed? I just did a pull and got nothing newer than a commit > from corvid on Feb 11th. Yes, in the 1.3 branch. -- Cheers Jorge.-

March 25, 2011

[bug]: CSS image crash

by onepoint＠starurchin.org

Jorge Arellano Cid wrote: > Patch committed (just typos). Is it pushed? I just did a pull and got nothing newer than a commit from corvid on Feb 11th. Regards, Jeremy Henty

March 25, 2011

[bug]: CSS image crash

by jcid＠dillo.org

On Wed, Mar 23, 2011 at 08:56:53PM +0100, Johannes Hofmann wrote: > On Tue, Mar 22, 2011 at 04:04:06PM +0000, Jeremy Henty wrote: > > > > OK, patch attached. Please comment. I just added checks for a NULL > > borderColor.top where necessary. I am still not sure if the > > drawBorder* functions are doing exactly the right thing but at the > > least the patch stops the crash and I don't think it makes the > > behaviour any worse. > > > > Please comment, > > To me the references to style->borderColor.top in drawBorder*() other > than drawBorderTop() look like a typo, but I might be wrong. > Jorge, can you please have a look? Patch committed (just typos). I took some time to review it because borders are not simple. There's pixel matching, the case of simulated "collapsing" mode with asymmetric tricks, etc. Funny how we all were looking at it at the same time. :-) Attached goes an example that shows the corrected flaws. -- Cheers Jorge.-

March 25, 2011

[bug]: CSS image crash

by jcid＠dillo.org

On Wed, Mar 23, 2011 at 08:56:53PM +0100, Johannes Hofmann wrote: > On Tue, Mar 22, 2011 at 04:04:06PM +0000, Jeremy Henty wrote: > > > > OK, patch attached. Please comment. I just added checks for a NULL > > borderColor.top where necessary. I am still not sure if the > > drawBorder* functions are doing exactly the right thing but at the > > least the patch stops the crash and I don't think it makes the > > behaviour any worse. > > > > Please comment, > > To me the references to style->borderColor.top in drawBorder*() other > than drawBorderTop() look like a typo, but I might be wrong. > Jorge, can you please have a look? I'm checking it now... -- Cheers Jorge.-

March 24, 2011