* [gentoo-commits] gentoo commit in src/patchsets/mozilla-thunderbird/3.1.1: 1002-fix_double_buffer.diff 1002-fix_double_buffer.patch 1005-fix-disable-printing.patch
@ 2010-08-03 13:01 Jory Pratt (anarchy)
0 siblings, 0 replies; only message in thread
From: Jory Pratt (anarchy) @ 2010-08-03 13:01 UTC (permalink / raw
To: gentoo-commits
anarchy 10/08/03 13:01:00
Added: 1002-fix_double_buffer.patch
1005-fix-disable-printing.patch
Removed: 1002-fix_double_buffer.diff
Log:
update patchset for next release
Revision Changes Path
1.1 src/patchsets/mozilla-thunderbird/3.1.1/1002-fix_double_buffer.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mozilla-thunderbird/3.1.1/1002-fix_double_buffer.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mozilla-thunderbird/3.1.1/1002-fix_double_buffer.patch?rev=1.1&content-type=text/plain
Index: 1002-fix_double_buffer.patch
===================================================================
http://bugs.gentoo.org/324863
Fix buffer overflow with GCC 4.5 and -U_FORTIFY_SOURCE=2
Patch by Harald van Dijk
--- comm-1.9.2/mozilla/extensions/spellcheck/hunspell/src/hashmgr.cpp
+++ comm-1.9.2/mozilla/extensions/spellcheck/hunspell/src/hashmgr.cpp
@@ -187,7 +187,7 @@
struct hentry* hp =
(struct hentry *) malloc (sizeof(struct hentry) + wbl + descl);
if (!hp) return 1;
- char * hpw = &(hp->word);
+ char * hpw = HENTRY_WORD(hp);
strcpy(hpw, word);
if (ignorechars != NULL) {
if (utf8) {
--- comm-1.9.2/mozilla/extensions/spellcheck/hunspell/src/htypes.hxx
+++ comm-1.9.2/mozilla/extensions/spellcheck/hunspell/src/htypes.hxx
@@ -57,6 +57,8 @@
#ifndef _HTYPES_HXX_
#define _HTYPES_HXX_
+#include <cstddef>
+
#define ROTATE_LEN 5
#define ROTATE(v,q) \
@@ -68,7 +70,7 @@
#define H_OPT_PHON (1 << 2)
// see also csutil.hxx
-#define HENTRY_WORD(h) &(h->word)
+#define HENTRY_WORD(h) ((char *) h + offsetof(struct hentry, word))
// approx. number of user defined words
#define USERWORD 1000
1.1 src/patchsets/mozilla-thunderbird/3.1.1/1005-fix-disable-printing.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mozilla-thunderbird/3.1.1/1005-fix-disable-printing.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mozilla-thunderbird/3.1.1/1005-fix-disable-printing.patch?rev=1.1&content-type=text/plain
Index: 1005-fix-disable-printing.patch
===================================================================
diff --git a/mailnews/base/src/Makefile.in b/mailnews/base/src/Makefile.in
--- a/mailnews/base/src/Makefile.in
+++ b/mailnews/base/src/Makefile.in
@@ -110,17 +110,16 @@ CPPSRCS = \
nsMsgFolderCache.cpp \
nsMsgFolderCacheElement.cpp \
nsMsgFolderCompactor.cpp \
nsMsgStatusFeedback.cpp \
nsMsgWindow.cpp \
nsMsgServiceProvider.cpp \
nsSubscribeDataSource.cpp \
nsSubscribableServer.cpp \
- nsMsgPrintEngine.cpp \
nsStatusBarBiffManager.cpp \
nsMsgDBView.cpp \
nsMsgThreadedDBView.cpp \
nsMsgSpecialViews.cpp \
nsMsgQuickSearchDBView.cpp \
nsMsgSearchDBView.cpp \
nsMsgXFVirtualFolderDBView.cpp \
nsMsgXFViewThread.cpp \
@@ -132,16 +131,22 @@ CPPSRCS = \
nsSpamSettings.cpp \
nsCidProtocolHandler.cpp \
nsMsgContentPolicy.cpp \
nsMsgTagService.cpp\
nsMsgFolderNotificationService.cpp\
nsMailDirProvider.cpp\
$(NULL)
+ifdef NS_PRINTING
+CPPSRCS += \
+ nsMsgPrintEngine.cpp \
+ $(NULL)
+endif
+
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
CMMSRCS = nsMessengerOSXIntegration.mm
endif
ifeq ($(OS_ARCH),WINNT)
REQUIRES += appcomps \
profile \
$(NULL)
diff --git a/mailnews/base/src/nsMessenger.cpp b/mailnews/base/src/nsMessenger.cpp
--- a/mailnews/base/src/nsMessenger.cpp
+++ b/mailnews/base/src/nsMessenger.cpp
@@ -74,17 +74,20 @@
#include "nsRDFCID.h"
// gecko
#include "nsLayoutCID.h"
#include "nsIMarkupDocumentViewer.h"
#include "nsIContentViewer.h"
// embedding
+#ifdef NS_PRINTING
#include "nsIWebBrowserPrint.h"
+#include "nsMsgPrintEngine.h"
+#endif
/* for access to docshell */
#include "nsPIDOMWindow.h"
#include "nsIDocShell.h"
#include "nsIDocShellLoadInfo.h"
#include "nsIDocShellTreeItem.h"
#include "nsIDocShellTreeNode.h"
#include "nsIWebNavigation.h"
@@ -119,19 +122,16 @@
// undo
#include "nsITransaction.h"
#include "nsMsgTxn.h"
// charset conversions
#include "nsMsgMimeCID.h"
#include "nsIMimeConverter.h"
-// Printing
-#include "nsMsgPrintEngine.h"
-
// Save As
#include "nsIFilePicker.h"
#include "nsIStringBundle.h"
#include "nsIPrefService.h"
#include "nsIPrefBranch.h"
#include "nsIPrefBranch2.h"
#include "nsCExternalHandlerService.h"
#include "nsIExternalProtocolService.h"
diff --git a/mailnews/build/nsMailModule.cpp b/mailnews/build/nsMailModule.cpp
--- a/mailnews/build/nsMailModule.cpp
+++ b/mailnews/build/nsMailModule.cpp
@@ -104,17 +104,19 @@
#include "nsMsgCopyService.h"
#include "nsMsgFolderCache.h"
#include "nsMsgStatusFeedback.h"
#include "nsMsgFilterService.h"
#include "nsMsgWindow.h"
#include "nsMsgServiceProvider.h"
#include "nsSubscribeDataSource.h"
#include "nsSubscribableServer.h"
+#ifdef NS_PRINTING
#include "nsMsgPrintEngine.h"
+#endif
#include "nsMsgSearchSession.h"
#include "nsMsgSearchTerm.h"
#include "nsMsgSearchAdapter.h"
#include "nsMsgFolderCompactor.h"
#include "nsMsgThreadedDBView.h"
#include "nsMsgSpecialViews.h"
#include "nsMsgXFVirtualFolderDBView.h"
#include "nsMsgQuickSearchDBView.h"
@@ -346,17 +348,19 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSt
NS_GENERIC_FACTORY_CONSTRUCTOR(nsCopyMessageStreamListener)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgCopyService)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgFolderCache)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgStatusFeedback)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMsgWindow,Init)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMsgServiceProviderService, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSubscribeDataSource, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSubscribableServer, Init)
+#ifdef NS_PRINTING
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgPrintEngine)
+#endif
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFolderCompactState)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsOfflineStoreCompactState)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgThreadedDBView)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgThreadsWithUnreadDBView)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgWatchedThreadsWithUnreadDBView)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgSearchDBView)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgXFVirtualFolderDBView)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgQuickSearchDBView)
@@ -800,20 +804,22 @@ static const nsModuleComponentInfo gComp
{ "Mail/News Status Feedback", NS_MSGSTATUSFEEDBACK_CID,
NS_MSGSTATUSFEEDBACK_CONTRACTID,
nsMsgStatusFeedbackConstructor,
},
{ "Mail/News MsgWindow", NS_MSGWINDOW_CID,
NS_MSGWINDOW_CONTRACTID,
nsMsgWindowConstructor,
},
+#ifdef NS_PRINTING
{ "Mail/News Print Engine", NS_MSG_PRINTENGINE_CID,
NS_MSGPRINTENGINE_CONTRACTID,
nsMsgPrintEngineConstructor,
},
+#endif
{ "Mail/News Service Provider Service", NS_MSGSERVICEPROVIDERSERVICE_CID,
NS_MSGSERVICEPROVIDERSERVICE_CONTRACTID,
nsMsgServiceProviderServiceConstructor,
},
{ "Mail/News Subscribe Data Source", NS_SUBSCRIBEDATASOURCE_CID,
NS_SUBSCRIBEDATASOURCE_CONTRACTID,
nsSubscribeDataSourceConstructor,
},
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-08-03 13:02 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-03 13:01 [gentoo-commits] gentoo commit in src/patchsets/mozilla-thunderbird/3.1.1: 1002-fix_double_buffer.diff 1002-fix_double_buffer.patch 1005-fix-disable-printing.patch Jory Pratt (anarchy)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox