486621 - Should close file handle in gfxWindowsPlatform::FindFonts()

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Hiroyuki Ikezoe (:hiro)]

User-Agent:       Mozilla/5.0 (X11; U; Linux i686; ja; rv:1.8.0.4) Gecko/20060508 Firefox/3.0
Build Identifier: 

Should close file handle in gfxWindowsPlatform::FindFonts().



Reproducible: Always

Comment 1

[Hiroyuki Ikezoe (:hiro)]

Attachment: Proposed patch

Comment 2

[Hiroyuki Ikezoe (:hiro)]

Attachment: update

Ooops! I am silly.

+            if (handle != INVALID_HANDLE_VALUE)

Of course this is "handle == INVALID_HANDLE_VALUE".

Comment 3

[Brad Lassey [:blassey] (use needinfo?)]

Comment on attachment 370781 [details] [diff] [review]
update

>diff -r 50e34c4934c2 gfx/thebes/src/gfxWindowsPlatform.cpp
>--- a/gfx/thebes/src/gfxWindowsPlatform.cpp    Fri Apr 03 09:35:07 2009 +0900
>+++ b/gfx/thebes/src/gfxWindowsPlatform.cpp    Fri Apr 03 12:11:21 2009 +0900
>@@ -278,24 +278,27 @@ gfxWindowsPlatform::FindFonts()
>     searchPaths.AppendElement(pathBuf);
>     WIN32_FIND_DATAW results;
>     for (PRUint32 i = 0;  i < searchPaths.Length(); i++) {
>         const nsString& path(searchPaths[i]);
>         for (PRUint32 j = 0; j < fontPatterns.Length(); j++) { 
>             nsAutoString pattern(path);
>             pattern.Append(fontPatterns[j]);
>             HANDLE handle = FindFirstFileW(pattern.get(), &results);
>-            PRBool moreFiles = handle != INVALID_HANDLE_VALUE;
>+            if (handle == INVALID_HANDLE_VALUE)
>+                continue;
>+            PRBool moreFiles = PR_TRUE;
>             while (moreFiles) {
>                 nsAutoString filePath(path);
>                 filePath.AppendLiteral("\\");
>                 filePath.Append(results.cFileName);
>                 AppendFacesFromFontFile(static_cast<const PRUnichar*>(filePath.get()));
>                 moreFiles = FindNextFile(handle, &results);
>             }
>+            FindClose(handle);
>         }
>     }
> }
> 
> #endif
> 
> 
> nsresult


Doing something like this would be cleaner:

if (handle != INVALID_HANDLE_VALUE)
    FindClose(handle);

r=me with that change

Comment 4

[Hiroyuki Ikezoe (:hiro)]

Attachment: Update patch

Address Brad's comment.

Comment 5

[Brad Lassey [:blassey] (use needinfo?)]

Comment on attachment 371542 [details] [diff] [review]
Update patch

requesting review from module owner

Comment 6

[Brad Lassey [:blassey] (use needinfo?)]

pushed http://hg.mozilla.org/mozilla-central/rev/d848c91b892b