Changeset 1e5ac43 in git

Timestamp:

14/01/14 02:23:57 (6 years ago)

Author:

Olly Betts <olly@…>

Branches:

line_contents, master, stereo, travis-osx

Children:

b4d8642

Parents:

70462c8

git-author:

Olly Betts <olly@…> (13/01/14 04:09:15)

git-committer:

Olly Betts <olly@…> (14/01/14 02:23:57)

Message:

src/export.cc: Escape '<', '>', and '&' in labels in exported SVG
files.

Files:

• ChangeLog (modified) (1 diff)
• src/export.cc (modified) (3 diffs)

ChangeLog

@@ +1 @@
+Mon Jan 13 04:08:11 GMT 2014  Olly Betts <olly@survex.com>
+
+        * src/export.cc: Escape '<', '>', and '&' in labels in exported SVG
+          files.
+
 Mon Jan 13 04:02:26 GMT 2014  Olly Betts <olly@survex.com>
 

src/export.cc

@@ -61 +61 @@
 
 #define SQRT_2          1.41421356237309504880168872420969
+
+static void
+html_escape(FILE *fh, const char *s)
+{
+    while (*s) {
+        switch (*s) {
+            case '<':
+                fputs("&lt;", fh);
+                break;
+            case '>':
+                fputs("&gt;", fh);
+                break;
+            case '&':
+                fputs("&amp;", fh);
+                break;
+            default:
+                PUTC(*s, fh);
+        }
+        ++s;
+    }
+}
 
 static const char *layer_name(int mask) {
@@ -565 +586 @@
                "viewBox=\"0 0 %0.3f %0.3f\">\n",
            width, unit, height, unit, width, height);
+   if (title && title[0]) {
+       fputs("<title>", fh);
+       html_escape(fh, title);
+       fputs("</title>\n", fh);
+   }
    fprintf(fh, "<g transform=\"translate(%.3f %.3f)\">\n",
            SVG_MARGIN - min_x * factor, SVG_MARGIN + max_y * factor);
@@ -619 +645 @@
    fprintf(fh, "<text transform=\"translate(%.3f %.3f)\">",
            p->x * factor, p->y * -factor);
-   fputs(s, fh);
+   html_escape(fh, s);
    fputs("</text>\n", fh);
    set_name(p, s);