summaryrefslogtreecommitdiffstats
path: root/opensuse/core/tdelibs/kdelibs-3.5.10-cve-2009-2537-select-length.patch
diff options
context:
space:
mode:
authorRobert Xu <rxu@linux-zdwj.site>2012-02-01 00:31:59 -0500
committerRobert Xu <rxu@linux-zdwj.site>2012-02-01 00:31:59 -0500
commitf599f39717d771b8b7a2aff006cda6c31e8b12da (patch)
treef601e3c0303a193cda6f8c6f956619dda9673c70 /opensuse/core/tdelibs/kdelibs-3.5.10-cve-2009-2537-select-length.patch
parentead369ac94473139a2320a1c90cda64dd887b94a (diff)
parent27c9e783c6283f8916ebee3a23c6d1ba909a5126 (diff)
downloadtde-packaging-f599f39717d771b8b7a2aff006cda6c31e8b12da.tar.gz
tde-packaging-f599f39717d771b8b7a2aff006cda6c31e8b12da.zip
Merge branch 'suse'
Diffstat (limited to 'opensuse/core/tdelibs/kdelibs-3.5.10-cve-2009-2537-select-length.patch')
-rw-r--r--opensuse/core/tdelibs/kdelibs-3.5.10-cve-2009-2537-select-length.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/opensuse/core/tdelibs/kdelibs-3.5.10-cve-2009-2537-select-length.patch b/opensuse/core/tdelibs/kdelibs-3.5.10-cve-2009-2537-select-length.patch
new file mode 100644
index 000000000..5972b0a38
--- /dev/null
+++ b/opensuse/core/tdelibs/kdelibs-3.5.10-cve-2009-2537-select-length.patch
@@ -0,0 +1,30 @@
+diff -ur kdelibs-3.5.10/khtml/ecma/kjs_html.cpp kdelibs-3.5.10-cve-2009-2537-select-length/khtml/ecma/kjs_html.cpp
+--- kdelibs-3.5.10/khtml/ecma/kjs_html.cpp 2008-02-13 10:41:09.000000000 +0100
++++ kdelibs-3.5.10-cve-2009-2537-select-length/khtml/ecma/kjs_html.cpp 2009-07-26 04:54:52.000000000 +0200
+@@ -62,6 +62,9 @@
+
+ #include <kdebug.h>
+
++// CVE-2009-2537 (vendors agreed on max 10000 elements)
++#define MAX_SELECT_LENGTH 10000
++
+ namespace KJS {
+
+ KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE(HTMLDocumentProto, DOMDocumentProto)
+@@ -2550,8 +2553,14 @@
+ case SelectValue: { select.setValue(str); return; }
+ case SelectLength: { // read-only according to the NS spec, but webpages need it writeable
+ Object coll = Object::dynamicCast( getSelectHTMLCollection(exec, select.options(), select) );
+- if ( coll.isValid() )
+- coll.put(exec,"length",value);
++
++ if ( coll.isValid() ) {
++ if (value.toInteger(exec) >= MAX_SELECT_LENGTH) {
++ Object err = Error::create(exec, RangeError);
++ exec->setException(err);
++ } else
++ coll.put(exec, "length", value);
++ }
+ return;
+ }
+ // read-only: form