Attachment 13275 Details for Bug 12790 – 3.2 Fix for crash

[patch] 3.2 Fix for crash

TempFileFix32.patch (text/plain), 1.94 KB, created by Sriram on 2007-02-20 10:00:16 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Sriram

Created: 2007-02-20 10:00:16 PST

Size: 1.94 KB

patch

obsolete

>Index: WebKit/ChangeLog
>===================================================================
>--- WebKit/ChangeLog	(revision 19736)
>+++ WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,10 @@
>+yadavall, reviewed by zalan
>+ DESC: Browser crashes when trying to open rss link
>+ http://bugs.webkit.org/show_bug.cgi?id=12790
>+
>+        * ResourceLoader/src/DefaultContentHandler.cpp:
>+        (CTempFile::ConstructL):
>+
> brmorris, reviewed by zalan
>  DESC: Reverts r19963 and re-applies with the updated patch. PNIO-6YFCUT:  Strange conversion problem (in get " changed to %2522 instead of %22) with for example google search.
>  http://bugs.webkit.org/show_bug.cgi?id=12792
>Index: WebKit/ResourceLoader/src/DefaultContentHandler.cpp
>===================================================================
>--- WebKit/ResourceLoader/src/DefaultContentHandler.cpp	(revision 19466)
>+++ WebKit/ResourceLoader/src/DefaultContentHandler.cpp	(working copy)
>@@ -97,17 +97,22 @@
>     User::LeaveIfError( iFsSession.Connect() );
>     // make any directories in KTempFilePath that do not yet exist
>     iFsSession.MkDirAll( KTempFilePath );
>+    TInt err = aFileName == NULL ? KErrGeneral : KErrNone;
>     if(aFileName != NULL)
>         {
>         iFileName = HBufC::NewL(aFileName->Length() + KTempFilePath().Length());
>         iFileName->Des().Copy(KTempFilePath);
>         iFileName->Des().Append(*aFileName);
>-        User::LeaveIfError(iFile.Replace(iFsSession, *iFileName, EFileWrite));
>+        err = iFile.Replace(iFsSession, *iFileName, EFileWrite);
>         }
>-    else
>+
>+    //Use temp file even if Replace function failed.
>+    if(err != KErrNone)
>         {
>+        delete iFileName;
>+        iFileName = 0;
>         TFileName tempName;
>-        iFile.Temp( iFsSession, KTempFilePath, tempName, EFileWrite );
>+        User::LeaveIfError(iFile.Temp( iFsSession, KTempFilePath, tempName, EFileWrite ));
>         iFileName = tempName.AllocL();
>         }
>     }

Flags:

zalan: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 12790: 13201 | 13274 | 13275