Attachment 926224 Details for Bug 1129491 – hack

[patch] hack

reparse-hack.patch (text/plain), 2.34 KB, created by David Woodhouse on 2014-08-12 22:57:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Woodhouse

Created: 2014-08-12 22:57:47 UTC

Size: 2.34 KB

patch

obsolete

>diff --git a/libpskc/build.c b/libpskc/build.c
>index 8f0840f..d1689b3 100644
>--- a/libpskc/build.c
>+++ b/libpskc/build.c
>@@ -468,6 +468,8 @@ build_keycont (pskc_t * container, xmlNodePtr keycont)
>   return PSKC_OK;
> }
> 
>+void
>+parse_keycontainer (pskc_t * pd, xmlNode * x, int *rc, int reparse);
> /**
>  * pskc_build_xml:
>  * @container: a #pskc_t handle, from pskc_init().
>@@ -508,6 +510,9 @@ pskc_build_xml (pskc_t * container, char **out, size_t * len)
>       return rc;
>     }
> 
>+  /* Update all internal pointers to point to the new XML */
>+  parse_keycontainer (container, keycont, &rc, 1);
>+
>   xmlDocSetRootElement (doc, keycont);
> 
>   if (container->xmldoc)
>diff --git a/libpskc/parser.c b/libpskc/parser.c
>index 47f8bd6..1a529ed 100644
>--- a/libpskc/parser.c
>+++ b/libpskc/parser.c
>@@ -569,7 +569,7 @@ parse_keypackage (xmlNode * x, struct pskc_key *kp, int *rc)
> }
> 
> static void
>-parse_keypackages (pskc_t * pd, xmlNode * x, int *rc)
>+parse_keypackages (pskc_t * pd, xmlNode * x, int *rc, int reparse)
> {
>   xmlNode *cur_node = NULL;
> 
>@@ -582,6 +582,7 @@ parse_keypackages (pskc_t * pd, xmlNode * x, int *rc)
> 
>       if (strcmp ("KeyPackage", name) == 0)
> 	{
>+	 if (!reparse) {
> 	  struct pskc_key *tmp;
> 
> 	  tmp = realloc (pd->keypackages,
>@@ -597,7 +598,7 @@ parse_keypackages (pskc_t * pd, xmlNode * x, int *rc)
> 
> 	  memset (&pd->keypackages[pd->nkeypackages - 1], 0,
> 		  sizeof (*pd->keypackages));
>-
>+         }
> 	  parse_keypackage (cur_node->children,
> 			    &pd->keypackages[pd->nkeypackages - 1], rc);
> 	}
>@@ -611,8 +612,10 @@ parse_keypackages (pskc_t * pd, xmlNode * x, int *rc)
>     }
> }
> 
>-static void
>-parse_keycontainer (pskc_t * pd, xmlNode * x, int *rc)
>+void
>+parse_keycontainer (pskc_t * pd, xmlNode * x, int *rc, int reparse);
>+void
>+parse_keycontainer (pskc_t * pd, xmlNode * x, int *rc, int reparse)
> {
>   xmlAttr *cur_attr = NULL;
>   const char *name = (const char *) x->name;
>@@ -639,7 +642,7 @@ parse_keycontainer (pskc_t * pd, xmlNode * x, int *rc)
> 	}
>     }
> 
>-  parse_keypackages (pd, x->children, rc);
>+  parse_keypackages (pd, x->children, rc, reparse);
> }
> 
> /**
>@@ -720,7 +723,7 @@ pskc_parse_from_memory (pskc_t * container, size_t len, const char *buffer)
>   container->xmldoc = xmldoc;
> 
>   root = xmlDocGetRootElement (xmldoc);
>-  parse_keycontainer (container, root, &rc);
>+  parse_keycontainer (container, root, &rc, 0);
> 
>   return rc;
> }

Actions: View | Diff

Attachments on bug 1129491: 926222 | 926224 | 926225