From: simon <simon@cda61777-01e9-0310-a592-d414129be87e>
Date: Mon, 25 Jul 2011 18:18:52 +0000 (+0000)
Subject: Fix assertion failure in standalone --html mode, which I must have
X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/agedu/commitdiff_plain/4fc86a0679d5d70b1a3944b26294c376b5f63abe

Fix assertion failure in standalone --html mode, which I must have
introduced when I revamped the HTML relative-URI handling.


git-svn-id: svn://svn.tartarus.org/sgt/agedu@9248 cda61777-01e9-0310-a592-d414129be87e
---

diff --git a/html.c b/html.c
index 7f82f39..8233993 100644
--- a/html.c
+++ b/html.c
@@ -869,7 +869,10 @@ char *html_query(const void *t, unsigned long index,
 
     path = snewn(1+trie_maxpathlen(t), char);
     ctx->path2 = path2 = snewn(1+trie_maxpathlen(t), char);
-    ctx->oururi = format_string(cfg->uriformat, index, t);
+    if (cfg->uriformat)
+        ctx->oururi = format_string(cfg->uriformat, index, t);
+    else
+        ctx->oururi = NULL;
 
     /*
      * HEAD section.