rpms/inkscape
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Alternate patch.

Browse Source
This commit is contained in:
Gwyn Ciesla 2019-01-14 15:23:50 -06:00
parent d023248aac
commit 87a998fe7f
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
inkscape-0.92.3-oob.patch Normal file
View File

@ -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);
}

11
inkscape-0.92.3-out-of-bounds.patch
View File

@ -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;

7
inkscape.spec
View File

@ -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 <limburgher@gmail.com> - 0.92.3-10
- Alternate out of bounds patch.
* Fri Jan 11 2019 Gwyn Ciesla <limburgher@gmail.com> - 0.92.3-9
- Patch for out of bounds.