Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/mozilla/patches/mozilla-1.7.12-amd64-gcc4-crash-fix.patch

    Contents of /trunk/mozilla/patches/mozilla-1.7.12-amd64-gcc4-crash-fix.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 153 - (show annotations) (download)
    Tue May 8 20:52:56 2007 UTC (17 years ago) by niro
    File size: 2109 byte(s) 
    -import
    1 diff -Naur mozilla.orig/modules/libpr0n/src/imgLoader.cpp mozilla/modules/libpr0n/src/imgLoader.cpp
    2 --- mozilla.orig/modules/libpr0n/src/imgLoader.cpp 2005-08-06 23:45:47.000000000 +0200
    3 +++ mozilla/modules/libpr0n/src/imgLoader.cpp 2005-08-06 23:51:25.000000000 +0200
    4 @@ -896,7 +896,7 @@
    5 // the network.
    6 aProxy->AddToLoadGroup();
    7
    8 - mProxies.AppendElement(aProxy);
    9 + mProxies.AppendObject(aProxy);
    10 }
    11
    12 /** nsIRequestObserver methods **/
    13 @@ -909,13 +909,10 @@
    14 PRBool isFromCache;
    15 if (NS_SUCCEEDED(cacheChan->IsFromCache(&isFromCache)) && isFromCache) {
    16
    17 - PRUint32 count;
    18 - mProxies.Count(&count);
    19 + PRUint32 count = mProxies.Count();
    20 for (PRInt32 i = count-1; i>=0; i--) {
    21 - imgRequestProxy *proxy;
    22 - mProxies.GetElementAt(i, (nsISupports**)&proxy);
    23 + imgRequestProxy *proxy = NS_STATIC_CAST(imgRequestProxy *, mProxies[i]);
    24 mRequest->NotifyProxyListener(proxy);
    25 - NS_RELEASE(proxy);
    26 }
    27
    28 mRequest->SetLoadId(mContext);
    29 @@ -964,14 +961,11 @@
    30
    31 mDestListener = NS_STATIC_CAST(nsIStreamListener*, pl);
    32
    33 - PRUint32 count;
    34 - mProxies.Count(&count);
    35 + PRUint32 count = mProxies.Count();
    36 for (PRInt32 i = count-1; i>=0; i--) {
    37 - imgRequestProxy *proxy;
    38 - mProxies.GetElementAt(i, (nsISupports**)&proxy);
    39 + imgRequestProxy *proxy = NS_STATIC_CAST(imgRequestProxy *, mProxies[i]);
    40 proxy->ChangeOwner(request);
    41 request->NotifyProxyListener(proxy);
    42 - NS_RELEASE(proxy);
    43 }
    44
    45 NS_RELEASE(request);
    46 diff -Naur mozilla.orig/modules/libpr0n/src/imgLoader.h mozilla/modules/libpr0n/src/imgLoader.h
    47 --- mozilla.orig/modules/libpr0n/src/imgLoader.h 2005-08-06 23:45:47.000000000 +0200
    48 +++ mozilla/modules/libpr0n/src/imgLoader.h 2005-08-06 23:48:22.000000000 +0200
    49 @@ -90,7 +90,7 @@
    50 * validate checker
    51 */
    52
    53 -#include "nsSupportsArray.h"
    54 +#include "nsCOMArray.h"
    55
    56 class imgCacheValidator : public nsIStreamListener
    57 {
    58 @@ -109,7 +109,7 @@
    59 nsCOMPtr<nsIStreamListener> mDestListener;
    60
    61 imgRequest *mRequest;
    62 - nsSupportsArray mProxies;
    63 + nsCOMArray<imgIRequest> mProxies;
    64
    65 void *mContext;
    66 };