Fix font handles leak. We return without freeing resources.

src/ports/SkFontHost_win.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkAdvancedTypefaceMetrics.h"
 #include "SkBase64.h"
@@ skipping 1368 matching lines @@
         (otm.otmTextMetrics.tmPitchAndFamily & TMPF_TRUETYPE)) {
         info->fType = SkAdvancedTypefaceMetrics::kTrueType_Font;
     } else {
         info->fType = SkAdvancedTypefaceMetrics::kOther_Font;
         info->fItalicAngle = 0;
         info->fAscent = 0;
         info->fDescent = 0;
         info->fStemV = 0;
         info->fCapHeight = 0;
         info->fBBox = SkIRect::MakeEmpty();
-        return info;
+        goto ReturnInfo;
     }
 
     // If this bit is clear the font is a fixed pitch font.
     if (!(otm.otmTextMetrics.tmPitchAndFamily & TMPF_FIXED_PITCH)) {
         info->fStyle |= SkAdvancedTypefaceMetrics::kFixedPitch_Style;
     }
     if (otm.otmTextMetrics.tmItalic) {
         info->fStyle |= SkAdvancedTypefaceMetrics::kItalic_Style;
     }
     if (otm.otmTextMetrics.tmPitchAndFamily & FF_ROMAN) {
@@ skipping 45 matching lines @@
         } else {
             info->fGlyphWidths.reset(
                 getAdvanceData(hdc,
                                glyphCount,
                                glyphIDs,
                                glyphIDsCount,
                                &getWidthAdvance));
         }
     }
 
 Error:

[Vitaly Buka (NO REVIEWS), 2013/04/06 19:33:43]

Why not just rename Error: -> Exit: or Return:

[edisonn, 2013/04/08 15:09:43]

this message was lost somehow:
I prefer ReturnInfo, so it is explicit what we return. I don't want someone else
to have some other variable they want to return instead.

Anyway, we should update this code with smart object that delete the object, so
we don't have this kind of issues, but I did not want to make a bug change and
potentially introduce another bug

On 2013/04/06 19:33:43, Vitaly Buka wrote:

+ReturnInfo:
     SelectObject(hdc, savefont);
     DeleteObject(designFont);
     DeleteObject(font);
     DeleteDC(hdc);
 
     return info;
 }
 
 //Dummy representation of a Base64 encoded GUID from create_unique_font_name.
 #define BASE64_GUID_ID "XXXXXXXXXXXXXXXXXXXXXXXX"
@@ skipping 210 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "SkFontMgr.h"
 
 SkFontMgr* SkFontMgr::Factory() {
     // todo
     return NULL;
 }