Kaydet (Commit) 74b5e0d5 authored tarafından Julien Nabet's avatar Julien Nabet

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
üst 3be78645
--- 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;
+ }
}
}
}
...@@ -59,6 +59,7 @@ TARFILE_MD5=90010e213dd25648e70f0cc12f8fed55 ...@@ -59,6 +59,7 @@ TARFILE_MD5=90010e213dd25648e70f0cc12f8fed55
PATCH_FILES=\ PATCH_FILES=\
$(TARFILE_NAME)-fdo50988.patch \ $(TARFILE_NAME)-fdo50988.patch \
$(TARFILE_NAME)-fdo48601_part1.patch \
$(TARFILE_NAME).patch $(TARFILE_NAME).patch
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment