Attachment 303694 Details for Bug 441643 – Patch I'm applying

[patch] Patch I'm applying

mugshot-nsString-workaround.patch (text/plain), 1.02 KB, created by Owen Taylor on 2008-04-24 21:24:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Taylor

Created: 2008-04-24 21:24:00 UTC

Size: 1.02 KB

patch

obsolete

>Index: src/hippoControl.cpp
>===================================================================
>--- src/hippoControl.cpp	(revision 7402)
>+++ src/hippoControl.cpp	(working copy)
>@@ -44,7 +44,28 @@
> #include "nsIWidget.h"
> // For Firefox 2, this is "internal API".
> #ifdef HAVE_XULRUNNER
>+// For our usage of nsIDocument, we hit a problem where the
>+// size of nsString and nsString_external are different on
>+// some architectures. Since nsIDocument has a nsString
>+// member, accessing subsequent members then causes a crash
>+// because of their different location within the structure.
>+//
>+//  http://bugzilla.redhat.com/show_bug.cgi?id=441643
>+//  http://bugzilla.mozilla.org/show_bug.cgi?id=430581
>+
>+struct hippoDummyString {
>+    // These are the fields in the internal nsString in Gecko-1.9pre
>+    PRUnichar *mData;
>+    PRUint32 mLength;
>+    PRUint32 mFlags;
>+};
>+
>+#undef nsString
>+#define nsString hippoDummyString
> #include "nsIDocument.h"
>+#undef nsString
>+#define nsString_external
>+
> #include "nsPIDOMWindow.h"
> #endif
> #endif

Actions: View | Diff

Attachments on bug 441643: 301771 | 302438 | 303226 | 303440 | 303694