- Dillo-dev - lists.mailman3.com

Re: patch: cookies string leak
by jcid＠dillo.org March 20, 2008

March 20, 2008

On Fri, Feb 01, 2008 at 06:26:56PM +0000, place wrote: > Also, what would you think of me either > > - stuffing the "Cookie2: $Version=\"1\"\r\n" header into a_Cookies_get(url) OK. Basically the same way referer is handled. > or > - adding a function to http.c to accomplish the same thing? > ...with a_Cookies_get() changed to show a distinction between > don't-want-cookies and don't-have-cookies. > > I almost never have any cookies enabled, so I'd prefer not to send > the Cookie2 header all of the time when I don't want their cookies. No problem. Leak patch committed. -- Cheers Jorge.-

4 7

[patch] don't allocate tagnames on stack
by Johannes.Hofmann＠gmx.de March 20, 2008

March 20, 2008

Hi, here is another patch that avoids some malloc/free calls. Cheers, Johannes diff --git a/src/html.cc b/src/html.cc --- a/src/html.cc +++ b/src/html.cc @@ -194,7 +194,7 @@ struct _DilloLinkImage { }; struct _DilloHtmlState { - char *tag_name; + const char *tag_name; dw::core::style::Style *style, *table_cell_style; DilloHtmlParseMode parse_mode; DilloHtmlTableMode table_mode; @@ -815,7 +815,7 @@ DilloHtml::DilloHtml(BrowserWindow *p_bw stack = new misc::SimpleVector <DilloHtmlState> (16); stack->increase(); - stack->getRef(0)->tag_name = dStrdup("none"); + stack->getRef(0)->tag_name = "none"; stack->getRef(0)->style = NULL; stack->getRef(0)->table_cell_style = NULL; stack->getRef(0)->parse_mode = DILLO_HTML_PARSE_MODE_INIT; @@ -1014,7 +1014,6 @@ void DilloHtml::closeParser(int ClientKe Html_tag_cleanup_at_close(this, stack->getRef(si)->tag_idx); } } - dFree(stack->getRef(0)->tag_name); /* "none" */ (stack->getRef(0)->style)->unref (); /* template style */ delete (stack); @@ -1596,18 +1595,14 @@ static void Html_eventually_pop_dw(Dillo */ static void Html_push_tag(DilloHtml *html, int tag_idx) { - char *tagstr; int n_items; - - /* Save the element's name (no parameters) into tagstr. */ - tagstr = dStrdup(Tags[tag_idx].name); n_items = html->stack->size (); html->stack->increase (); /* We'll copy the former stack item and just change the tag and its index * instead of copying all fields except for tag. --Jcid */ *html->stack->getRef(n_items) = *html->stack->getRef(n_items - 1); - html->stack->getRef(n_items)->tag_name = tagstr; + html->stack->getRef(n_items)->tag_name = Tags[tag_idx].name; html->stack->getRef(n_items)->tag_idx = tag_idx; /* proper memory management, may be unref'd later */ (S_TOP(html)->style)->ref (); @@ -1635,7 +1630,6 @@ static void Html_real_pop_tag(DilloHtml (S_TOP(html)->style)->unref (); if (S_TOP(html)->table_cell_style) (S_TOP(html)->table_cell_style)->unref (); - dFree(S_TOP(html)->tag_name); hand_over_break = S_TOP(html)->hand_over_break; html->stack->setSize (html->stack->size() - 1); Html_eventually_pop_dw(html, hand_over_break); @@ -5582,7 +5576,7 @@ static int Html_write_raw(DilloHtml *htm DILLO_HTML_PARSE_MODE_VERBATIM) { /* Non HTML code here, let's skip until closing tag */ do { - char *tag = S_TOP(html)->tag_name; + const char *tag = S_TOP(html)->tag_name; buf_index += strcspn(buf + buf_index, "<"); if (buf_index + (int)strlen(tag) + 3 > bufsize) { buf_index = bufsize;

2 3

[jcid@dillo.org: Re: [Dillo-dev] Re: patch: concatenate Dstrs]
by jcid＠dillo.org March 19, 2008

March 19, 2008

-- Cheers Jorge.-

1 0

[patch] further reduce redraws from resizing tables
by Johannes.Hofmann＠gmx.de March 18, 2008

March 18, 2008

Hi, below is another patch to reduce the redraws caused by resizing tables. A new method Layout::queueDrawExcept(), that requests the drawing of a rectangle except another rectangle is added. It is then used in widget.cc to redraw the area that was previously occupied by a widget, but is no longer occupied after a resize or move. This makes it possible to redraw less when a table resizes. All in all it should reduce the flicker a bit when loading table based pages. Cheers, Johannes diff --git a/dw/layout.cc b/dw/layout.cc --- a/dw/layout.cc +++ b/dw/layout.cc @@ -610,11 +610,36 @@ void Layout::queueDraw (int x, int y, in area.width = width; area.height = height; + if (area.isEmpty ()) return; + for (container::typed::Iterator <View> it = views->iterator (); it.hasNext (); ) { View *view = it.getNext (); view->queueDraw (&area); } +} + +void Layout::queueDrawExcept (int x, int y, int width, int height, + int ex, int ey, int ewidth, int eheight) { + + if (x == ex && y == ey && width == ewidth && height == eheight) + return; + + // queueDraw() the four rectangles within rectangle (x, y, width, height) + // around rectangle (ex, ey, ewidth, eheight). + // Some or all of these may be empty. + + // upper left corner of the intersection rectangle + int ix1 = misc::max (x, ex); + int iy1 = misc::max (y, ey); + // lower right corner of the intersection rectangle + int ix2 = misc::min (x + width, ex + ewidth); + int iy2 = misc::min (y + height, ey + eheight); + + queueDraw (x, y, width, iy1 - y); + queueDraw (x, iy2, width, y + height - iy2); + queueDraw (x, iy1, ix1 - x, iy2 - iy1); + queueDraw (ix2, iy1, x + width - ix2, iy2 - iy1); } void Layout::queueResize (bool asap) diff --git a/dw/layout.hh b/dw/layout.hh --- a/dw/layout.hh +++ b/dw/layout.hh @@ -133,6 +133,8 @@ private: void updateCursor (); void updateBgColor (); void queueDraw (int x, int y, int width, int height); + void queueDrawExcept (int x, int y, int width, int height, + int ex, int ey, int ewidth, int eheight); void queueResize (bool asap); void removeWidget (); diff --git a/dw/table.cc b/dw/table.cc --- a/dw/table.cc +++ b/dw/table.cc @@ -61,6 +61,7 @@ Table::Table(bool limitTextWidth) hasColPercent = 0; colPercents = new misc::SimpleVector <float> (8); + redrawX = 0; redrawY = 0; } @@ -191,10 +192,11 @@ void Table::sizeAllocateImpl (core::Allo void Table::resizeDrawImpl () { + queueDrawArea (redrawX, 0, allocation.width - redrawX, getHeight ()); queueDrawArea (0, redrawY, allocation.width, getHeight () - redrawY); + redrawX = allocation.width; redrawY = getHeight (); } - void Table::setWidth (int width) { diff --git a/dw/table.hh b/dw/table.hh --- a/dw/table.hh +++ b/dw/table.hh @@ -378,7 +378,7 @@ private: int numRows, numCols, curRow, curCol; misc::SimpleVector<Child*> *children; - int redrawY; + int redrawX, redrawY; /** * \brief The extremes of all columns. @@ -437,11 +437,7 @@ private: void setCumHeight (int row, int value) { if (value != cumHeight->get (row)) { - if (row > 0) { - redrawY = misc::min ( redrawY, cumHeight->get (row - 1) ); - } else { - redrawY = 0; - } + redrawY = misc::min ( redrawY, value ); cumHeight->set (row, value); } } @@ -449,7 +445,7 @@ private: inline void setColWidth (int col, int value) { if (value != colWidths->get (col)) { - redrawY = 0; + redrawX = misc::min (redrawX, value); colWidths->set (col, value); } } diff --git a/dw/types.hh b/dw/types.hh --- a/dw/types.hh +++ b/dw/types.hh @@ -71,6 +71,7 @@ public: bool intersectsWith (Rectangle *otherRect, Rectangle *dest); bool isSubsetOf (Rectangle *otherRect); bool isPointWithin (int x, int y); + bool isEmpty () { return width <= 0 || height <= 0; }; }; /** diff --git a/dw/widget.cc b/dw/widget.cc --- a/dw/widget.cc +++ b/dw/widget.cc @@ -418,6 +418,18 @@ void Widget::sizeAllocate (Allocation *a // widget->allocation.x, widget->allocation.y, // widget->allocation.width, widget->allocation.ascent, // widget->allocation.descent); + + if (wasAllocated ()) { + layout->queueDrawExcept ( + this->allocation.x, + this->allocation.y, + this->allocation.width, + this->allocation.ascent + this->allocation.descent, + allocation->x, + allocation->y, + allocation->width, + allocation->ascent + allocation->descent); + } sizeAllocateImpl (allocation);

2 4

saving files under recent fltk snapshots?
by place＠gobigwest.com March 18, 2008

March 18, 2008

I moved to snapshot 6066 (I'd been on 5990) the other day, and now I notice that dillo is unresponsive after I save a file. Seen in the 6059 announcement (http://fltk.org/articles.php?L791) "+ Changed the modal event loop of file_chooser() and dir_chooser() to use a new exec() method that delegates to Window::exec() internally. This exec() method should handle unpleasant side effects with other modal windows when closing the file_chooser dialog window. + Updated FileChooser.fl to reflect modifications made in the cxx/h files. Please do not edit these files directly (except the include header) Thanks." If anybody's tried a recent snapshot: Does it work for you?

3 2

[patch] don't restart scanning from start in Html_parse_entities ()
by Johannes.Hofmann＠gmx.de March 18, 2008

March 18, 2008

Hi, below is a small optinization to Html_parse_entities (). Cheers, Johannes diff -r bd486ec2a522 src/html.cc --- a/src/html.cc Sat Mar 15 19:41:01 2008 +0100 +++ b/src/html.cc Sat Mar 15 20:23:03 2008 +0100 @@ -1397,13 +1397,14 @@ static char * { const char *esc_set = "&\xE2\xC2"; char *new_str, buf[4]; - int i, j, k, n, isocode, entsize; + int i, j, k, n, s, isocode, entsize; new_str = dStrndup(token, toksize); - if (new_str[strcspn(new_str, esc_set)] == 0) + s = strcspn(new_str, esc_set); + if (new_str[s] == 0) return new_str; - for (i = j = 0; i < toksize; i++) { + for (i = j = s; i < toksize; i++) { if (token[i] == '&' && (isocode = Html_parse_entity(html, token+i, toksize-i, &entsize)) >= 0) {

3 3

patch: multipart/form-data CRLF
by place＠gobigwest.com March 17, 2008

March 17, 2008

Happened to notice in the RFC that multipart types must use CRLF between body parts. PS It was a bit annoying to figure out that http.c needed to be changed, which suggests that it would have been better for me to store the boundary string in DilloUrl somewhere after all.

2 1

patch: meta charset changes decoder
by place＠gobigwest.com March 16, 2008

March 16, 2008

This is no sort of proper fix whatsoever, but I was tired of seeing the "would set charset" message. It's actually surprisingly useful for remote files, since they're generally still at the javascript-and-css point at the end of the first packet.

3 9

libiconv fix for OpenBSD
by Christian.Kellermann＠nefkom.net March 16, 2008

March 16, 2008

Dear List, let me again thank you for your great efforts! One minor thing I stumbled upon today's update: My System has the following iconv signature: size_t iconv (iconv_t cd, const char* * inbuf, size_t * inbytesleft, char* * outbuf, size_t * outbytesleft); I therefore need something like the following to make dillo compile (an work) again: Index: src/html.cc =================================================================== RCS file: /sfhome/cvs/dillo/dillo2/src/html.cc,v retrieving revision 1.48 diff -b -u -p -r1.48 html.cc --- src/html.cc 13 Mar 2008 14:58:44 -0000 1.48 +++ src/html.cc 13 Mar 2008 21:43:26 -0000 @@ -3844,7 +3844,8 @@ static Dstr *Html_encode_text(iconv_t en int rc = 0; Dstr *output; const int bufsize = 128; - char *buffer, *inPtr, *outPtr; + const char *inPtr; + char *buffer, *outPtr; size_t inLeft, outRoom; bool bad_chars = false; I hope this does not break other systems. Kind regards, Christian -- You may use my gpg key for replies: pub 1024D/47F79788 2005/02/02 Christian Kellermann (C-Keen)

2 7

[PATCH]: a_Dpiapi_dialog should call a_Dialog_choice3 with 3 parameters
by onepoint＠starurchin.org March 15, 2008

March 15, 2008

a_Dpiapi_dialog() calls a_Dialog_choice3() with 2 parameters instead of 3. This causes the dialog to pop up a third button with a garbage label, and valgrind reports 'Conditional jump or move depends on uninitialised value(s)' from inside FLTK. Patch attached. This bug slipped through because dpiapi.c does not include dialog.hh to get the prototype of a_Dialog_choice3() . I'm not sure how to fix this: should a C source file be including a C++ header? If not, how else can dpiapi.c get the prototype? Regards, Jeremy Henty

2 3