diff --git a/0001-tdf-96250-desktop-empty-str-is-the-same-as-0-str-in-.patch b/0001-tdf-96250-desktop-empty-str-is-the-same-as-0-str-in-.patch new file mode 100644 index 0000000..5188b25 --- /dev/null +++ b/0001-tdf-96250-desktop-empty-str-is-the-same-as-0-str-in-.patch @@ -0,0 +1,28 @@ +From e22f9ae034addbddbb5581cdee6bfd1c39aeedea Mon Sep 17 00:00:00 2001 +From: Miklos Vajna +Date: Mon, 7 Dec 2015 14:54:19 +0100 +Subject: [PATCH] tdf#96250 desktop: empty str is the same as 0 str in + jsonToPropertyValues() + +Change-Id: I77306dc998afc53bb1d5710a8d1ae68717f945d1 +(cherry picked from commit 5cc574fefc8a2ee39db4a4bd843a3ec67dce2f11) +--- + desktop/source/lib/init.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx +index 8682ce8..2bdea80 100644 +--- a/desktop/source/lib/init.cxx ++++ b/desktop/source/lib/init.cxx +@@ -264,7 +264,7 @@ static OUString getAbsoluteURL(const char* pURL) + static void jsonToPropertyValues(const char* pJSON, uno::Sequence& rPropertyValues) + { + std::vector aArguments; +- if (pJSON) ++ if (pJSON && pJSON[0] != '\0') + { + boost::property_tree::ptree aTree; + std::stringstream aStream(pJSON); +-- +2.5.0 + diff --git a/libreoffice.spec b/libreoffice.spec index fb76048..2877843 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -326,6 +326,7 @@ Patch19: 0001-fix-powerpc-build.patch Patch20: 0001-update-the-appstream-files-to-most-recent-version-of.patch Patch21: 0001-tdf-96243-don-t-crash-if-LibO-install.-wasn-t-found.patch Patch22: 0001-tdf-96246-Make-pRenderingArguments-nullable.patch +Patch23: 0001-tdf-96250-desktop-empty-str-is-the-same-as-0-str-in-.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice