From d918e36dc1b3374a707a6681c44d597b78f1a9da Mon Sep 17 00:00:00 2001
From: Michael R Sweet
Date: Mon, 21 Jul 2003 12:41:47 +0000
Subject: [PATCH] Fix mxmlSaveString-related bugs reported by Robert...
Bump version to 1.1.1.
---
CHANGES | 12 +++++++++++-
README | 4 ++--
documentation.html | 2 +-
index.html | 6 +++---
mxml-file.c | 7 ++++---
5 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/CHANGES b/CHANGES
index 098fb6a..b8afdd9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,16 @@
-README - 07/20/2003
+README - 07/21/2003
-------------------
+CHANGES IN Mini-XML 1.1.1
+
+ - The private mxml_add_ch() function did not update the
+ start-of-buffer pointer which could cause a crash when
+ using mxmlSaveString().
+ - The private mxml_write_ws() function called putc()
+ instead of using the proper callback which could cause
+ a crash when using mxmlSaveString().
+
+
CHANGES IN Mini-XML 1.1
- The mxmlLoadFile() function now uses dynamically
diff --git a/README b/README
index 137611d..d209a79 100644
--- a/README
+++ b/README
@@ -1,11 +1,11 @@
-README - 07/20/2003
+README - 07/21/2003
-------------------
INTRODUCTION
This README file describes the Mini-XML library version
- 1.1.
+ 1.1.1.
Mini-XML is a small XML parsing library that you can use to
read XML and XML-like data files in your application without
diff --git a/documentation.html b/documentation.html
index 1b3b334..cfb367d 100644
--- a/documentation.html
+++ b/documentation.html
@@ -11,7 +11,7 @@
Contents
Mini-XML Home Page
-Current Release: v1.1, July 20, 2003
+
Current Release: v1.1.1, July 21, 2003
[ Download Source (.tar.gz 70k)
+href="mxml-1.1.1.tar.gz">Download Source (.tar.gz 70k)
| Download Linux RPM (.i386.rpm 64k)
+href="mxml-1.1.1-1.i386.rpm">Download Linux RPM (.i386.rpm 64k)
| Change Log | Documentation | Rate/Make Comments ]
diff --git a/mxml-file.c b/mxml-file.c
index 4dafe09..520f6f9 100644
--- a/mxml-file.c
+++ b/mxml-file.c
@@ -1,5 +1,5 @@
/*
- * "$Id: mxml-file.c,v 1.15 2003/07/20 13:41:17 mike Exp $"
+ * "$Id: mxml-file.c,v 1.16 2003/07/21 12:41:47 mike Exp $"
*
* File loading code for mini-XML, a small XML-like file parsing library.
*
@@ -228,6 +228,7 @@ mxml_add_char(int ch, /* I - Character to add */
return (-1);
}
+ *buffer = newbuffer;
*bufptr = newbuffer + (*bufptr - *buffer);
}
@@ -1355,7 +1356,7 @@ mxml_write_ws(mxml_node_t *node, /* I - Current node */
if (cb && (ch = (*cb)(node, ws)) != 0)
{
- if ((*putc)(ch, p) < 0)
+ if ((*putc_cb)(ch, p) < 0)
return (-1);
else if (ch == '\n')
col = 0;
@@ -1373,5 +1374,5 @@ mxml_write_ws(mxml_node_t *node, /* I - Current node */
/*
- * End of "$Id: mxml-file.c,v 1.15 2003/07/20 13:41:17 mike Exp $".
+ * End of "$Id: mxml-file.c,v 1.16 2003/07/21 12:41:47 mike Exp $".
*/