Fix a memory leak found by Valgrind.

See https://developer.mozilla.org/en/NPN_GetProperty for doc
on proper use of NPN_GetProperty.

BUG=9515

Review URL: http://codereview.chromium.org/155730

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21027 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 6 deletions

diff --git a/webkit/glue/cpp_variant.cc b/webkit/glue/cpp_variant.cc
index c0827c6..2f6be0c 100644
--- a/webkit/glue/cpp_variant.cc
+++ b/webkit/glue/cpp_variant.cc
@@ -229,19 +229,24 @@ std::vector<std::wstring> CppVariant::ToStringVector() const {
         length = static_cast<int>(NPVARIANT_TO_DOUBLE(length_value));
       else if (NPVARIANT_IS_INT32(length_value))
         length = NPVARIANT_TO_INT32(length_value);
+      NPN_ReleaseVariantValue(&length_value);
+
       // For sanity, only allow 100 items.
-	  length = std::min(100, length);
+      length = std::min(100, length);
       for (int i = 0; i < length; ++i) {
         // Get each of the items.
         std::string index = StringPrintf("%d", i);
         NPIdentifier index_id = NPN_GetStringIdentifier(index.c_str());
         if (NPN_HasProperty(NULL, np_value, index_id)) {
           NPVariant index_value;
-          if (NPN_GetProperty(NULL, np_value, index_id, &index_value) &&
-              NPVARIANT_IS_STRING(index_value)) {
-            std::string string(NPVARIANT_TO_STRING(index_value).UTF8Characters,
-                               NPVARIANT_TO_STRING(index_value).UTF8Length);
-            wstring_vector.push_back(UTF8ToWide(string));
+          if (NPN_GetProperty(NULL, np_value, index_id, &index_value)) {
+            if (NPVARIANT_IS_STRING(index_value)) {
+              std::string string(
+                  NPVARIANT_TO_STRING(index_value).UTF8Characters,
+                  NPVARIANT_TO_STRING(index_value).UTF8Length);
+              wstring_vector.push_back(UTF8ToWide(string));
+            }
+            NPN_ReleaseVariantValue(&index_value);
           }
         }
       }