rpms/webkitgtk
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rhbz#1189303 - [abrt] midori: WebCore::SQLiteStatement::prepare(): midori killed by SIGSEGV

Browse Source 
Initialize string in SQLiteStatement before using it
This commit is contained in:
Tomas Popela 2015-09-25 07:43:11 +02:00
parent 48e358163f
commit e689e45d0c
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
webkitgtk-2.4.9-sql_initialize_string.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp.sql_initialize_string webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp
--- webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp.sql_initialize_string 2015-09-14 09:25:43.004200172 +0200
+++ webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp 2015-09-14 09:25:57.852082368 +0200
@@ -71,7 +71,7 @@ int SQLiteStatement::prepare()
// this lets SQLite avoid an extra string copy.
size_t lengthIncludingNullCharacter = query.length() + 1;
- const char* tail;
+ const char* tail = nullptr;
int error = sqlite3_prepare_v2(m_database.sqlite3Handle(), query.data(), lengthIncludingNullCharacter, &m_statement, &tail);
if (error != SQLITE_OK)

9
webkitgtk.spec
View File

@ -10,7 +10,7 @@
Name: webkitgtk
Version: 2.4.9
Release: 2%{?dist}
Release: 3%{?dist}
Summary: GTK+ Web content engine library
Group: Development/Libraries
@ -27,6 +27,8 @@ Patch3: webkitgtk-2.4.5-cloop_fix_32.patch
Patch4: webkitgtk-2.4.1-ppc64_align.patch
# https://bugs.webkit.org/show_bug.cgi?id=142074
Patch5: webkitgtk-2.4.8-user-agent.patch
# http://trac.webkit.org/changeset/169665
Patch6: webkitgtk-2.4.9-sql_initialize_string.patch
BuildRequires: bison
BuildRequires: chrpath
@ -93,6 +95,7 @@ This package contains developer documentation for %{name}.
%patch1 -p1 -b .aarch64
%patch2 -p1 -b .cloop_fix
%patch5 -p1 -b .user_agent
%patch6 -p1 -b .sql_initialize_string
# required for 32-bit big-endians
%ifarch ppc s390
%patch3 -p1 -b .cloop_fix_32
@ -215,6 +218,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%{_datadir}/gtk-doc/html/webkitgtk
%changelog
* Fri Sep 25 2015 Tomas Popela <tpopela@redhat.com> - 2.4.9-3
- rhbz#1189303 - [abrt] midori: WebCore::SQLiteStatement::prepare(): midori killed by SIGSEGV
Initialize string in SQLiteStatement before using it
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild