Skip to content

Commit

Permalink
Merge branch '4.5' of [email protected]:qt/qt into 4.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Jason McDonald committed Jun 16, 2009
2 parents bc0ad71 + dd1e63d commit d4ea395
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 2 deletions.
1 change: 1 addition & 0 deletions dist/changes-4.5.2
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ General Improvements
Network (r41664, r42516, r42747)
Plugins (r41346, r43550, r43915, r43917, r43923)
Clipboard (r41360)
SVG (r43590, r43795)

- QAbstractItemView
* [250754] Changing the font of the view did not update the size of the
Expand Down
2 changes: 1 addition & 1 deletion src/3rdparty/webkit/VERSION
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ The commit imported was from the

and has the sha1 checksum

4ee8af9348b3f57d3c0f3575ae0a58336cf07a92
44bbcef18007e00c6cfee294640c5cfc9e464aa4
28 changes: 28 additions & 0 deletions src/3rdparty/webkit/WebCore/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
2009-05-15 Adam Barth <[email protected]>

Reviewed by Oliver Hunt.

https://bugs.webkit.org/show_bug.cgi?id=25741

Append instead of throwing when insertItemBefore gets an out-of-bound
index.

Test: svg/dom/svglist-insertItemBefore-appends.html

* svg/SVGList.h:
(WebCore::SVGList::insertItemBefore):

2009-03-19 Oliver Hunt <[email protected]>

Reviewed by Darin Adler.

<rdar://problem/6702386> Incorrect bound check in SVGList::insertItemBefore

SVGList::insertItemBefore would not perform a bounds check on the
index it was provided, potentially leading to a buffer overflow.

Test: svg/dom/svglist-exception-on-out-bounds-error.html

* svg/SVGList.h:
(WebCore::SVGList::insertItemBefore):

2009-05-19 Kenneth Rohde Christiansen <[email protected]>

Reviewed by Simon Hausmann.
Expand Down
6 changes: 5 additions & 1 deletion src/3rdparty/webkit/WebCore/svg/SVGList.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,11 @@ namespace WebCore {

Item insertItemBefore(Item newItem, unsigned int index, ExceptionCode&)
{
m_vector.insert(index, newItem);
if (index < m_vector.size()) {
m_vector.insert(index, newItem);
} else {
m_vector.append(newItem);
}
return newItem;
}

Expand Down

0 comments on commit d4ea395

Please sign in to comment.