hhctrl.ocx: Fix the mem handling in get_attr() (Smatch).

name_buf is allocated on the stack and node_buf by heap_alloc. Also don't leak node_buf when leaving the function.

hhctrl.ocx: Fix the mem handling in get_attr() (Smatch).
85afcdbf · Michael Stefaniuc · Alexandre Julliard · 69861cf8 · 85afcdbf
Commit 85afcdbf authored Jan 26, 2010 by Michael Stefaniuc Committed by Alexandre Julliard Jan 27, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

content.c dlls/hhctrl.ocx/content.c +6 -4

No files found.
--- a/dlls/hhctrl.ocx/content.c
+++ b/dlls/hhctrl.ocx/content.c
@@ -186,7 +186,7 @@ static const char *get_attr(const char *node, const char *name, int *len)
    ptr = strstr(node_buf, name_buf);
    if(!ptr) {
        WARN("name not found\n");
-        heap_free(name_buf);
+        heap_free(node_buf);
        return NULL;
    }

@@ -194,14 +194,16 @@ static const char *get_attr(const char *node, const char *name, int *len)
    ptr2 = strchr(ptr, '\"');
    if(!ptr2)
    {
-        heap_free(name_buf);
+        heap_free(node_buf);
        return NULL;
    }

    *len = ptr2-ptr;
-    heap_free(name_buf);
    /* Return the pointer offset within the original string */
-    return node+(ptr-node_buf);
+    ptr = node+(ptr-node_buf);
+
+    heap_free(node_buf);
+    return ptr;
 }

 static void parse_obj_node_param(ContentItem *item, ContentItem *hhc_root, const char *text)