Attachment 926225 Details for Bug 1129491 – less horrid, but less efficient fix

[patch] less horrid, but less efficient fix

retain-original-xmldoc.patch (text/plain), 1.44 KB, created by David Woodhouse on 2014-08-12 23:02:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Woodhouse

Created: 2014-08-12 23:02:49 UTC

Size: 1.44 KB

patch

obsolete

>diff --git a/libpskc/build.c b/libpskc/build.c
>index 8f0840f..c3e84ad 100644
>--- a/libpskc/build.c
>+++ b/libpskc/build.c
>@@ -510,7 +510,7 @@ pskc_build_xml (pskc_t * container, char **out, size_t * len)
> 
>   xmlDocSetRootElement (doc, keycont);
> 
>-  if (container->xmldoc)
>+  if (container->xmldoc && container->xmldoc != container->original_xmldoc)
>     xmlFreeDoc (container->xmldoc);
>   container->xmldoc = doc;
>   doc = NULL;
>diff --git a/libpskc/internal.h b/libpskc/internal.h
>index 674625d..9b36e28 100644
>--- a/libpskc/internal.h
>+++ b/libpskc/internal.h
>@@ -103,7 +103,7 @@ struct pskc_key
> struct pskc
> {
>   /* raw XML */
>-  xmlDocPtr xmldoc;
>+  xmlDocPtr xmldoc, original_xmldoc;
>   /* Is there a Signature element in xmldoc? */
>   int signed_p;
> 
>diff --git a/libpskc/parser.c b/libpskc/parser.c
>index 47f8bd6..d75e5ac 100644
>--- a/libpskc/parser.c
>+++ b/libpskc/parser.c
>@@ -677,6 +677,8 @@ pskc_done (pskc_t * container)
>     return;
> 
>   xmlFreeDoc (container->xmldoc);
>+  if (container->original_xmldoc != container->xmldoc)
>+	  xmlFreeDoc (container->original_xmldoc);
> 
>   for (i = 0; i < container->nkeypackages; i++)
>     {
>@@ -717,7 +719,7 @@ pskc_parse_from_memory (pskc_t * container, size_t len, const char *buffer)
>   if (xmldoc == NULL)
>     return PSKC_XML_ERROR;
> 
>-  container->xmldoc = xmldoc;
>+  container->original_xmldoc = container->xmldoc = xmldoc;
> 
>   root = xmlDocGetRootElement (xmldoc);
>   parse_keycontainer (container, root, &rc);

Actions: View | Diff

Attachments on bug 1129491: 926222 | 926224 | 926225