second round of memory updates. libxml memory is being cleaned up by …

…v8 GC
libxmljs · May 21, 2010 · 63ec543 · 63ec543
1 parent 393b44a
commit 63ec543
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/src/xml_attribute.cc b/src/xml_attribute.cc
@@ -21,6 +21,8 @@ XmlAttribute::New(const v8::Arguments& args) {
                              (const xmlChar*)*name,
                              (const xmlChar*)*value);
 
+  UpdateV8Memory();
+
   // namespace passed in
   if (args.Length() == 4 && args[3]->IsObject()) {
     XmlNamespace *ns = LibXmlObj::Unwrap<XmlNamespace>(args[3]->ToObject());

diff --git a/src/xml_document.cc b/src/xml_document.cc
@@ -135,6 +135,9 @@ XmlDocument::New(const v8::Arguments& args) {
     version = new v8::String::Utf8Value(v8::String::New("1.0"));
 
   xmlDoc* doc = xmlNewDoc((const xmlChar*)**version);
+
+  UpdateV8Memory();
+
   v8::Persistent<v8::Object> obj =
     LXJS_GET_MAYBE_BUILD(XmlDocument, doc);
   XmlDocument *document = LibXmlObj::Unwrap<XmlDocument>(obj);
@@ -156,11 +159,13 @@ XmlDocument::New(const v8::Arguments& args) {
 
 XmlDocument::~XmlDocument() {
   xmlFreeDoc(xml_obj);
+  UpdateV8Memory();
 }
 
 void
 XmlDocument::set_encoding(const char* encoding) {
-  xml_obj->encoding = xmlStrdup((const xmlChar*)encoding);
+    if(xml_obj->encoding != NULL) xmlFree((xmlChar*)xml_obj->encoding);
+    xml_obj->encoding = xmlStrdup((const xmlChar*)encoding);
 }
 
 v8::Handle<v8::Value>

diff --git a/src/xml_element.cc b/src/xml_element.cc
@@ -105,7 +105,7 @@ XmlElement::Attr(const v8::Arguments& args) {
       }
       break;
 
-    // 1 or 2 arguments only dude
+    // 1 argument only dude
     default:
       LIBXMLJS_THROW_EXCEPTION(
         "Bad argument(s): #attr(name) or #attr({name: value})");
@@ -144,7 +144,7 @@ XmlElement::AddChild(const v8::Arguments& args) {
   child = element->import_element(child);
 
   if(child == NULL) {
-      LIBXMLJS_THROW_EXCEPTION("Could not add child (%s). Failed to copy node to new Document.");
+      LIBXMLJS_THROW_EXCEPTION("Could not add child. Failed to copy node to new Document.");
   }
 
   element->add_child(child);
@@ -469,7 +469,11 @@ XmlElement::import_element(XmlElement *element) {
         if(new_child == NULL) {
             return NULL;
         }
+
         element->remove();
+
+        UpdateV8Memory();
+
         return LibXmlObj::Unwrap<XmlElement>(LXJS_GET_MAYBE_BUILD(XmlElement, new_child));
     }
 }

diff --git a/src/xml_namespace.cc b/src/xml_namespace.cc
@@ -30,6 +30,8 @@ XmlNamespace::New(const v8::Arguments& args) {
                        (const xmlChar*)**href,
                        prefix ? (const xmlChar*)**prefix : NULL);
 
+  UpdateV8Memory();
+
   if (prefix)
     delete prefix;
   delete href;