From cdb68d3e5128a93b5c9b35041d780619f1af5e5a Mon Sep 17 00:00:00 2001
From: edfus <edfusedfus@gmail.com>
Date: Thu, 29 Apr 2021 16:53:06 +0800
Subject: [PATCH] fix: accept svg strings with data URI scheme. a SVG that has
 a xlink:href beggining with `data:image/svg+xml;base64,` will be wrongly
 treated as a base64 data URI in current decision making statements.

---
 index.js      |  2 +-
 test/atob.svg | 26 ++++++++++++++++++++++++++
 test/specs.js | 10 ++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 test/atob.svg

diff --git a/index.js b/index.js
index 6d91e1f..6b38496 100644
--- a/index.js
+++ b/index.js
@@ -172,7 +172,7 @@ function loadSVGContent(svg, callback) {
     if (Buffer.isBuffer(svg)) {
         svg = svg.toString('utf-8');
     }
-    if (svg.indexOf('data:image/svg+xml;base64,') >= 0) {
+    if (svg.indexOf('data:image/svg+xml;base64,') >= 0 && !/^<svg/.test(svg)) {
         callback(null,atob(svg.substring('data:image/svg+xml;base64,'.length)));
     } else if (svg.indexOf('<svg') >= 0) {
         callback(null, svg);
diff --git a/test/atob.svg b/test/atob.svg
new file mode 100644
index 0000000..105e614
--- /dev/null
+++ b/test/atob.svg
@@ -0,0 +1,26 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="97" height="20" role="img"
+  aria-label="npm: v1.9.0">
+  <title>npm: v1.9.0</title>
+  <linearGradient id="s" x2="0" y2="100%">
+    <stop offset="0" stop-color="#bbb" stop-opacity=".1"></stop>
+    <stop offset="1" stop-opacity=".1"></stop>
+  </linearGradient>
+  <clipPath id="r">
+    <rect width="97" height="20" rx="3" fill="#fff"></rect>
+  </clipPath>
+  <g clip-path="url(#r)">
+    <rect width="52" height="20" fill="#555"></rect>
+    <rect x="52" width="45" height="20" fill="#007ec6"></rect>
+    <rect width="97" height="20" fill="url(#s)"></rect>
+  </g>
+  <g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif"
+    text-rendering="geometricPrecision" font-size="110">
+    <image x="5" y="3" width="14" height="14"
+      xlink:href="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0MCA0MCI+PHBhdGggZD0iTTAgMGg0MHY0MEgwVjB6IiBmaWxsPSIjY2IwMDAwIi8+PHBhdGggZmlsbD0iI2ZmZiIgZD0iTTcgN2gyNnYyNmgtN1YxNGgtNnYxOUg3eiIvPjwvc3ZnPgo=">
+    </image><text aria-hidden="true" x="355" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)"
+      textLength="250">npm</text><text x="355" y="140" transform="scale(.1)" fill="#fff"
+      textLength="250">npm</text><text aria-hidden="true" x="735" y="150" fill="#010101" fill-opacity=".3"
+      transform="scale(.1)" textLength="350">v1.9.0</text><text x="735" y="140" transform="scale(.1)" fill="#fff"
+      textLength="350">v1.9.0</text>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/test/specs.js b/test/specs.js
index 0d0d29c..966c264 100644
--- a/test/specs.js
+++ b/test/specs.js
@@ -62,6 +62,16 @@ describe('Convert SVG', function () {
         })
     });
 
+    it('convert a svg string with data URI to png',function(done) {
+        var svg = fs.readFileSync(__dirname+'/atob.svg');
+        svg2img(svg, null, function(error, data) {
+            expect(error).not.to.be.ok();
+            expect(Buffer.isBuffer(data)).to.be.ok();
+            expect(data.length).to.be.above(0);
+            done();
+        })
+    });
+
     it('convert a svg string to jpg',function(done) {
         var svg = fs.readFileSync(__dirname+'/ph.svg');
         svg2img(svg, {format:'jpeg'} ,function(error, data) {