Enabled g_mem_set_vtable through the configure option --with-overridable-allocators...

[mono.git] / eglib / src / gmarkup.c

diff --git a/eglib/src/gmarkup.c b/eglib/src/gmarkup.c
index c256f123a146a4694f5dfd229e2508bd72036f6b..4e6c6641fef542ac4fb758a51d27281baf556340 100644 (file)
--- a/eglib/src/gmarkup.c
+++ b/eglib/src/gmarkup.c
@@ -40,6 +40,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <stdio.h>
+#include <ctype.h>
 #include <glib.h>
 
 #define set_error(msg, ...) do { if (error != NULL) *error = g_error_new (GINT_TO_POINTER (1), 1, msg, __VA_ARGS__); } while (0);
@@ -99,10 +100,37 @@ g_markup_parse_context_free (GMarkupParseContext *context)
        g_free (context);
 }
 
+static gboolean
+my_isspace (char c)
+{
+       if (c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == '\v')
+               return TRUE;
+       return FALSE;
+}
+
+static gboolean
+my_isalnum (char c)
+{
+       if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'))
+               return TRUE;
+       if (c >= '0' && c <= '9')
+               return TRUE;
+
+       return FALSE;
+}
+
+static gboolean
+my_isalpha (char c)
+{
+       if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'))
+               return TRUE;
+       return FALSE;
+}
+
 static const char *
 skip_space (const char *p, const char *end)
 {
-       for (; p < end && isspace (*p); p++)
+       for (; p < end && my_isspace (*p); p++)
                ;
        return p;
 }
@@ -138,7 +166,7 @@ parse_name (const char *p, const char *end, char **value)
        const char *start = p;
        int l;
        
-       for (; p < end && isalnum (*p); p++)
+       for (; p < end && my_isalnum (*p); p++)
                ;
        if (p == end)
                return end;
@@ -248,7 +276,7 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
 
                switch (context->state){
                case START:
-                       if (c == ' ' || c == '\t' || c == '\f' || c == '\n')
+                       if (c == ' ' || c == '\t' || c == '\f' || c == '\n' || (c & 0x80))
                                continue;
                        if (c == '<'){
                                if (p+1 < end && p [1] == '?'){
@@ -268,7 +296,7 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
                        int full_stop = 0, l;
                        gchar **names = NULL, **values = NULL;
 
-                       for (; p < end && isspace (*p); p++)
+                       for (; p < end && my_isspace (*p); p++)
                                ;
                        if (p == end){
                                set_error ("%s", "Unfinished element");
@@ -281,12 +309,12 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
                                break;
                        }
                        
-                       if (!(isascii (*p) && isalpha (*p))){
+                       if (!my_isalpha (*p)){
                                set_error ("%s", "Expected an element name");
                                goto fail;
                        }
                        
-                       for (++p; p < end && (isalnum (*p) || (*p == '.')); p++)
+                       for (++p; p < end && (my_isalnum (*p) || (*p == '.')); p++)
                                ;
                        if (p == end){
                                set_error ("%s", "Expected an element");
@@ -294,7 +322,7 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
                        }
                        element_end = p;
                        
-                       for (; p < end && isspace (*p); p++)
+                       for (; p < end && my_isspace (*p); p++)
                                ;
                        if (p == end){
                                set_error ("%s", "Unfinished element");
@@ -339,7 +367,7 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
                                if (context->parser.end_element != NULL &&  context->state == START_ELEMENT){
                                        context->parser.end_element (context, ename, context->user_data, error);
                                        if (error != NULL && *error != NULL){
-                                               free (ename);
+                                               g_free (ename);
                                                goto fail;
                                        }
                                }
@@ -376,7 +404,7 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
                        break;
                        
                case FLUSH_TEXT:
-                       if (context->parser.text != NULL){
+                       if (context->parser.text != NULL && context->text != NULL){
                                context->parser.text (context, context->text->str, context->text->len,
                                                      context->user_data, error);
                                if (error != NULL && *error != NULL)