GH-179: Remove strdup and use Opt pattern.

Remove the use of strdup and associated frees and use the opt pattern. Signed-off-by: Nick Campbell <nicholas.j.campbell@gmail.com>
libxmljs · Jan 6, 2013 · dc4fa63 · dc4fa63
1 parent fca49f1
commit dc4fa63
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/src/xml_element.cc b/src/xml_element.cc
@@ -32,18 +32,17 @@ XmlElement::New(const v8::Arguments& args) {
 
   v8::String::Utf8Value name(args[1]);
 
-  char* content = NULL;
+  v8::Handle<v8::Value> contentOpt;
   if(args[2]->IsString()) {
-      v8::String::Utf8Value content_(args[2]);
-      content = strdup(*content_);
+      contentOpt = args[2];
   }
+  v8::String::Utf8Value contentRaw(contentOpt);
+  const char* content = (contentRaw.length()) ? *contentRaw : NULL;
 
   xmlNode* elem = xmlNewDocNode(document->xml_obj,
                                 NULL,
                                 (const xmlChar*)*name,
                                 (const xmlChar*)content);
-  if(content)
-      free(content);
 
   XmlElement* element = new XmlElement(elem);
   elem->_private = element;
@@ -124,17 +123,17 @@ XmlElement::AddCData(const v8::Arguments& args) {
   XmlElement* element = ObjectWrap::Unwrap<XmlElement>(args.Holder());
   assert(element);
 
-  v8::String::Utf8Value content_(args[0]->ToString());
-  char* content = NULL;
-  content = strdup(*content_);
+  v8::Handle<v8::Value> contentOpt;
+  if(args[0]->IsString()) {
+      contentOpt = args[0];
+  }
+  v8::String::Utf8Value contentRaw(contentOpt);
+  const char* content = (contentRaw.length()) ? *contentRaw : NULL;
 
   xmlNode* elem = xmlNewCDataBlock(element->xml_obj->doc,
                                   (const xmlChar*)content,
                                   xmlStrlen((const xmlChar*)content));
 
-  if(content)
-        free(content);
-
   element->add_cdata(elem);
   return scope.Close(args.Holder());
 }