diff --git a/inkscape-0.92.3-oob.patch b/inkscape-0.92.3-oob.patch new file mode 100644 index 0000000..bf5a7f5 --- /dev/null +++ b/inkscape-0.92.3-oob.patch @@ -0,0 +1,12 @@ +--- src/libnrtype/Layout-TNG-OutIter.cpp.orig 2019-01-11 19:56:12.701209914 +0100 ++++ src/libnrtype/Layout-TNG-OutIter.cpp 2019-01-11 19:58:19.624114664 +0100 +@@ -46,7 +46,8 @@ + best_x_difference = this_x_difference; + } + } +- if (best_char_index == -1) return iterator(this, char_index); ++ if (best_char_index == -1) best_char_index = char_index; ++ if (best_char_index == _characters.size()) return end(); + return iterator(this, best_char_index); + } + diff --git a/inkscape-0.92.3-out-of-bounds.patch b/inkscape-0.92.3-out-of-bounds.patch deleted file mode 100644 index 5e9378e..0000000 --- a/inkscape-0.92.3-out-of-bounds.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/libnrtype/Layout-TNG-OutIter.cpp~ 2018-12-04 08:57:55.000000000 -0600 -+++ src/libnrtype/Layout-TNG-OutIter.cpp 2019-01-11 08:22:33.026490234 -0600 -@@ -26,7 +26,7 @@ - double best_x_difference = DBL_MAX; - - if (char_index == _characters.size()) return end(); -- for ( ; char_index < _characters.size() ; char_index++) { -+ for ( ; char_index + 1 < _characters.size() ; char_index++) { - if (_characters[char_index].chunk(this).in_line != line_index) break; - if (_characters[char_index].char_attributes.is_mandatory_break) break; - if (!_characters[char_index].char_attributes.is_cursor_position) continue; diff --git a/inkscape.spec b/inkscape.spec index f55ebf4..a0f36fa 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -1,6 +1,6 @@ Name: inkscape Version: 0.92.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Vector-based drawing program using SVG # Inkscape tags their releases with underscores and in ALLCAPS @@ -21,7 +21,7 @@ Patch1: inkscape-python2.patch Patch2: inkscape-0.92.3-poppler-0.64.patch Patch3: inkscape-0.92.3-poppler-0.65.patch -Patch4: inkscape-0.92.3-out-of-bounds.patch +Patch4: inkscape-0.92.3-oob.patch Provides: bundled(libcroco) Provides: bundled(libgdl) @@ -229,6 +229,9 @@ pathfix.py -pni "%{__python2} %{py2_shbang_opts}" $RPM_BUILD_ROOT%{_datadir}/ink %changelog +* Mon Jan 14 2019 Gwyn Ciesla - 0.92.3-10 +- Alternate out of bounds patch. + * Fri Jan 11 2019 Gwyn Ciesla - 0.92.3-9 - Patch for out of bounds.