- rebuilt to fix --list-scripts=langs crash fixes rhbz #1656332

This commit is contained in:
Filipe Rosset 2018-12-10 22:54:43 -02:00
parent c10f0f745f
commit 100c825a3f
2 changed files with 23 additions and 4 deletions

View File

@ -0,0 +1,17 @@
diff --git a/src/core/platform_fs.cpp b/src/core/platform_fs.cpp
index 95e73534b487ee5b38a79b3ac4cda151292ca781..1a986fd5ec8785ed42ec075ea52b11d30734f659 100644
--- a/src/core/platform_fs.cpp
+++ b/src/core/platform_fs.cpp
@@ -256,8 +256,10 @@ void getFileNames ( const string &directory,const string &wildcard, vector<strin
if ( errno ) return;
// sort the current entries for fileName
- if ( firstEntry < fileName.size() )
- sort ( &fileName[firstEntry], &fileName[fileName.size() ] );
+ // https://gitlab.com/saalen/highlight/issues/84
+ // coredump with GLIBCXX_ASSERTIONS compiler option, use iterators if sort is needed
+ //if ( firstEntry < fileName.size() )
+ // sort ( &fileName[firstEntry], &fileName[fileName.size() ] );
// recurse into sub directories
// if not doing recursive, subDirectory is empty

View File

@ -1,13 +1,12 @@
Name: highlight
Summary: Universal source code to formatted text converter
Version: 3.47
Release: 1%{?dist}
Release: 2%{?dist}
Group: Development/Tools
License: GPLv3
URL: http://www.andre-simon.de/
Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
Patch0: fixed-directory-traversal-GLIBCXX_ASSERTIONS.patch
BuildRequires: gcc-c++
BuildRequires: qt5-qtbase-devel
BuildRequires: lua-devel, boost-devel
@ -36,7 +35,7 @@ Requires: %{name} = %{version}-%{release}
A Qt-based GUI for the highlight source code formatter source.
%prep
%autosetup
%autosetup -p1
%build
CFLAGS="$CFLAGS -fPIC %{optflags}"; export CFLAGS
@ -80,6 +79,9 @@ desktop-file-install \
%changelog
* Tue Dec 11 2018 Filipe Rosset <rosset.filipe@gmail.com> - 3.47-2
- rebuilt to fix --list-scripts=langs crash fixes rhbz #1656332
* Fri Oct 26 2018 Filipe Rosset <rosset.filipe@gmail.com> - 3.47-1
- Updated to new 3.47 upstream version
- spec cleanup (remove old unused comments)