Piotr Caban : msxml3: Use correct string length in saxreader_get_cdata_chunk.

Alexandre Julliard julliard at winehq.org
Fri Oct 6 14:58:53 CDT 2017


Module: wine
Branch: master
Commit: afdf7491efd7f9bc17ae021eb2ceb32649115e8e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=afdf7491efd7f9bc17ae021eb2ceb32649115e8e

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Thu Oct  5 14:59:56 2017 +0200

msxml3: Use correct string length in saxreader_get_cdata_chunk.

Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/msxml3/saxreader.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c
index 0549bc8..be2caf9 100644
--- a/dlls/msxml3/saxreader.c
+++ b/dlls/msxml3/saxreader.c
@@ -1972,6 +1972,7 @@ static BSTR saxreader_get_cdata_chunk(const xmlChar *str, int len)
     BSTR bstr = bstr_from_xmlCharN(str, len), ret;
     WCHAR *ptr;
 
+    len = SysStringLen(bstr);
     ptr = bstr + len - 1;
     while ((*ptr == '\r' || *ptr == '\n') && ptr >= bstr)
         ptr--;
@@ -2038,7 +2039,7 @@ static void libxml_cdatablock(void *ctx, const xmlChar *value, int len)
             while (i < len)
             {
                 if (value[i] != '\r' && value[i] != '\n') break;
-                    i++;
+                i++;
             }
             end = &value[i];
 




More information about the wine-cvs mailing list