From 514226e8c04ca483adff18bbad3a66f9b1593f07 Mon Sep 17 00:00:00 2001 From: Liam Z Date: Sun, 2 Oct 2016 19:49:56 +0800 Subject: Ignore v:imagedata elements without relationship ID with warning --- lib/docx/body-reader.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/docx/body-reader.js b/lib/docx/body-reader.js index 732a8d2..4a1655e 100644 --- a/lib/docx/body-reader.js +++ b/lib/docx/body-reader.js @@ -340,9 +340,15 @@ function BodyReader(options) { } function readImageData(element) { - return readImage( - findEmbeddedImageFile(element.attributes["r:id"]), - element.attributes["o:title"]); + var relationshipId = element.attributes['r:id']; + + if (relationshipId) { + return readImage( + findEmbeddedImageFile(relationshipId), + element.attributes["o:title"]); + } else { + return emptyResultWithMessages([warning("A v:imagedata element without a relationship ID was ignored")]); + } } function findEmbeddedImageFile(relationshipId) { -- cgit v1.2.3