rpms/thunderbird
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Added upstream gcc6 fix (mozbz#1167145)

Browse Source
This commit is contained in:
Martin Stransky 2016-02-25 11:24:35 +01:00
parent c3a4bf5849
commit 4dce6a949f
2 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
mozilla-1167145.patch Normal file
View File

@ -0,0 +1,34 @@
# HG changeset patch
# User Jonathan Kew <jkew@mozilla.com>
# Date 1432227274 -3600
# Thu May 21 17:54:34 2015 +0100
# Node ID 383fdad2853cd3dfc7c17e8a86ff4c29dce128bf
# Parent 4858f16b05179f87f41cdbf5a8cc3b33b540513a
Bug 1167145 - Check result of PrevInFlow() before trying to call a method on it.
diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -6142,18 +6142,20 @@ nsBlockFrame::ReflowPushedFloats(nsBlock
next = f->GetNextSibling();
prev = f;
} // else: we did push |f| so |prev|'s new next-sibling is next.
f = next;
}
// If there are continued floats, then we may need to continue BR clearance
if (0 != aState.ClearFloats(0, NS_STYLE_CLEAR_BOTH)) {
- aState.mFloatBreakType = static_cast<nsBlockFrame*>(GetPrevInFlow())
- ->FindTrailingClear();
+ nsBlockFrame* prevBlock = static_cast<nsBlockFrame*>(GetPrevInFlow());
+ if (prevBlock) {
+ aState.mFloatBreakType = prevBlock->FindTrailingClear();
+ }
}
}
void
nsBlockFrame::RecoverFloats(nsFloatManager& aFloatManager, WritingMode aWM,
nscoord aContainerWidth)
{
// Recover our own floats

9
thunderbird.spec
View File

@ -64,7 +64,7 @@
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
Version: 38.6.0
Release: 4%{?dist}
Release: 5%{?dist}
URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@ -92,6 +92,7 @@ Patch101: build-nspr-prbool.patch
Patch102: build-werror.patch
Patch103: rhbz-1219542-s390-build.patch
Patch104: firefox-gcc-6.0.patch
Patch105: mozilla-1167145.patch
# Linux specific
Patch200: thunderbird-enable-addons.patch
@ -209,6 +210,7 @@ cd mozilla
%patch103 -p1 -b .rhbz-1219542-s390-build
%endif
%patch104 -p1 -b .gcc6
%patch105 -p1 -b .1167145
%patch400 -p1 -b .966424
%patch402 -p1 -b .rhbz-1014858
@ -329,8 +331,6 @@ MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \
%{__sed} -e 's/-Wall//')
#rhbz#1037353
MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat -Werror=format-security"
# Disable null pointer gcc6 optimization (rhbz#1311886)
MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fno-delete-null-pointer-checks"
# Use hardened build?
%if %{?hardened_build}
MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now"
@ -596,6 +596,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#===============================================================================
%changelog
* Thu Feb 25 2016 Martin Stransky <stransky@redhat.com> - 38.6.0-5
- Added upstream gcc6 fix (mozbz#1167145)
* Thu Feb 25 2016 Martin Stransky <stransky@redhat.com> - 38.6.0-4
- Disabled gcc6 NULL pointer optimization (rhbz#1311886)