| author | Petr Sumbera <petr.sumbera@oracle.com> |
| Thu, 11 Apr 2013 05:15:26 -0700 | |
| branch | s11-update |
| changeset 2562 | dee01a72a7d4 |
| permissions | -rw-r--r-- |
|
2562
dee01a72a7d4
16292025 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
1 |
From 6a36fbe3b3e001a8a840b5c1fdd81cefc9947f0d Mon Sep 17 00:00:00 2001 |
|
dee01a72a7d4
16292025 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
2 |
From: Daniel Veillard <[email protected]> |
|
dee01a72a7d4
16292025 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
Date: Mon, 29 Oct 2012 02:39:55 +0000 |
|
dee01a72a7d4
16292025 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
4 |
Subject: Fix potential out of bound access |
|
dee01a72a7d4
16292025 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
|
|
dee01a72a7d4
16292025 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
--- |
|
dee01a72a7d4
16292025 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
diff --git a/parser.c b/parser.c |
|
dee01a72a7d4
16292025 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
index 0d8d7f2..bd634e9 100644 |
|
dee01a72a7d4
16292025 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
--- a/parser.c |
|
dee01a72a7d4
16292025 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
+++ b/parser.c |
|
dee01a72a7d4
16292025 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
@@ -4076,7 +4076,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) {
|
|
dee01a72a7d4
16292025 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
goto error; |
|
dee01a72a7d4
16292025 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
|
|
dee01a72a7d4
16292025 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
if ((in_space) && (normalize)) {
|
|
dee01a72a7d4
16292025 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
- while (buf[len - 1] == 0x20) len--; |
|
dee01a72a7d4
16292025 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
+ while ((len > 0) && (buf[len - 1] == 0x20)) len--; |
|
dee01a72a7d4
16292025 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
} |
|
dee01a72a7d4
16292025 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
buf[len] = 0; |
|
dee01a72a7d4
16292025 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
if (RAW == '<') {
|
|
dee01a72a7d4
16292025 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
-- |
|
dee01a72a7d4
16292025 problem in LIBRARY/LIBXML
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
cgit v0.9.0.2 |