Fix compilation error and memory leak

Bug: angleproject:2794 Change-Id: Iaedf83aabef6813c023b97387b35510165cb831c Reviewed-on: https://chromium-review.googlesource.com/1220370 Commit-Queue: Ian Elliott <ianelliott@google.com> Reviewed-by: Ian Elliott <ianelliott@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Fix compilation error and memory leak
a59ae05b · Ian Elliott · Commit Bot · 2da04538 · a59ae05b
Commit a59ae05b authored Sep 11, 2018 by Ian Elliott Committed by Commit Bot Sep 11, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

feature_support_util.cpp src/feature_support_util/feature_support_util.cpp +5 -3

No files found.
--- a/src/feature_support_util/feature_support_util.cpp
+++ b/src/feature_support_util/feature_support_util.cpp
@@ -902,22 +902,24 @@ ANGLE_EXPORT bool ANGLEUseForApplication(const char *appName,
 {
    Scenario scenario(appName, deviceMfr, deviceModel);
    RuleList *rules = RuleList::ReadRulesFromJsonFile();
+    bool rtn        = false;
    scenario.logScenario();
    rules->logRules();
    if (developerOption != ANGLE_NO_PREFERENCE)
    {
-        return (developerOption == ANGLE_PREFER_ANGLE);
+        rtn = (developerOption == ANGLE_PREFER_ANGLE);
    }
    else if ((appPreference != ANGLE_NO_PREFERENCE) && rules->getAppChoice(scenario))
    {
-        return (appPreference == ANGLE_PREFER_ANGLE);
+        rtn = (appPreference == ANGLE_PREFER_ANGLE);
    }
    else
    {
-        return rules->getAnswer(scenario);
+        rtn = rules->getAnswer(scenario);
    }
    delete rules;
+    return rtn;
 }
 }  // extern "C"