diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2012-06-16 15:01:23 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2012-06-16 15:07:37 +0200 |
| commit | 74b5e0d5e5b57755553fde6c77712a87025f1667 (patch) | |
| tree | 74d33f39aec4af3c535ff25cedb13ca5125f8454 | |
| parent | 3be786451b6a9accc46a08f0aed4f8d5a8794ffe (diff) | |
Related: fdo#48601 FILEOPEN: Open Visio's file with bitmap's blocks
This fdo contains 2 files with which I had a different crash for each of them.
This patch fixes one of the 2 crashes.
Change-Id: Ic67cad4de4b66e913debe95efc04db3ae6fbf781
| -rw-r--r-- | libvisio/libvisio-0.0.17-fdo48601_part1.patch | 26 | ||||
| -rw-r--r-- | libvisio/makefile.mk | 1 |
2 files changed, 27 insertions, 0 deletions
diff --git a/libvisio/libvisio-0.0.17-fdo48601_part1.patch b/libvisio/libvisio-0.0.17-fdo48601_part1.patch new file mode 100644 index 000000000000..c73af00dbfb5 --- /dev/null +++ b/libvisio/libvisio-0.0.17-fdo48601_part1.patch @@ -0,0 +1,26 @@ +--- misc/build/libvisio-0.0.17/src/lib/VSDXContentCollector.cpp 2012-06-16 13:41:40.583153038 +0200 ++++ misc/libvisio-0.0.17/src/lib/VSDXContentCollector.cpp 2012-06-16 13:44:16.311155881 +0200 +@@ -1131,14 +1131,16 @@ + if (x <= m_pageWidth && x >= 0) + points[x] = y; + +- xmove = points.begin()->first; +- ymove = points.begin()->second; +- for (std::map<double, double>::iterator iter = points.begin(); iter != points.end(); ++iter) +- { +- if (iter->first != xmove || iter->second != ymove) ++ if (!points.empty()) { ++ xmove = points.begin()->first; ++ ymove = points.begin()->second; ++ for (std::map<double, double>::iterator iter = points.begin(); iter != points.end(); ++iter) + { +- xline = iter->first; +- yline = iter->second; ++ if (iter->first != xmove || iter->second != ymove) ++ { ++ xline = iter->first; ++ yline = iter->second; ++ } + } + } + } diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk index 305a32b07bf8..28557416c51e 100644 --- a/libvisio/makefile.mk +++ b/libvisio/makefile.mk @@ -59,6 +59,7 @@ TARFILE_MD5=90010e213dd25648e70f0cc12f8fed55 PATCH_FILES=\ $(TARFILE_NAME)-fdo50988.patch \ + $(TARFILE_NAME)-fdo48601_part1.patch \ $(TARFILE_NAME).patch BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) |