Fixed test memory leaks

src/flags.cc

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 40 matching lines @@
 // to the actual flag, default value, comment, etc.  This is designed to be POD
 // initialized as to avoid requiring static constructors.
 struct Flag {
   enum FlagType { TYPE_BOOL, TYPE_INT, TYPE_FLOAT, TYPE_STRING, TYPE_ARGS };
 
   FlagType type_;           // What type of flag, bool, int, or string.
   const char* name_;        // Name of the flag, ex "my_flag".
   void* valptr_;            // Pointer to the global flag variable.
   const void* defptr_;      // Pointer to the default value.
   const char* cmt_;         // A comment about the flags purpose.
+  bool owns_ptr_;

[Søren Thygesen Gjesse, 2009/03/26 10:50:09]

Comment (or is it obvious)?

[Christian Plesner Hansen, 2009/03/27 00:24:26]

Done; it wasn't obvious.

 
   FlagType type() const { return type_; }
 
   const char* name() const { return name_; }
 
   const char* comment() const { return cmt_; }
 
   bool* bool_variable() const {
     ASSERT(type_ == TYPE_BOOL);
     return reinterpret_cast<bool*>(valptr_);
   }
 
   int* int_variable() const {
     ASSERT(type_ == TYPE_INT);
     return reinterpret_cast<int*>(valptr_);
   }
 
   double* float_variable() const {
     ASSERT(type_ == TYPE_FLOAT);
     return reinterpret_cast<double*>(valptr_);
   }
 
-  const char** string_variable() const {
+  const char* string_value() const {
     ASSERT(type_ == TYPE_STRING);
-    return reinterpret_cast<const char**>(valptr_);
+    return *reinterpret_cast<const char**>(valptr_);
+  }
+
+  void set_string_value(const char *value, bool owns_ptr) {
+    ASSERT(type_ == TYPE_STRING);
+    const char **ptr = reinterpret_cast<const char **>(valptr_);
+    if (owns_ptr_ && *ptr != NULL) DeleteArray(*ptr);
+    *ptr = value;
+    owns_ptr_ = owns_ptr;
   }
 
   JSArguments* args_variable() const {
     ASSERT(type_ == TYPE_ARGS);
     return reinterpret_cast<JSArguments*>(valptr_);
   }
 
   bool bool_default() const {
     ASSERT(type_ == TYPE_BOOL);
     return *reinterpret_cast<const bool*>(defptr_);
@@ skipping 22 matching lines @@
   // Compare this flag's current value against the default.
   bool IsDefault() const {
     switch (type_) {
       case TYPE_BOOL:
         return *bool_variable() == bool_default();
       case TYPE_INT:
         return *int_variable() == int_default();
       case TYPE_FLOAT:
         return *float_variable() == float_default();
       case TYPE_STRING: {
-        const char* str1 = *string_variable();
+        const char* str1 = string_value();
         const char* str2 = string_default();
         if (str2 == NULL) return str1 == NULL;
         if (str1 == NULL) return str2 == NULL;
         return strcmp(str1, str2) == 0;
       }
       case TYPE_ARGS:
         return args_variable()->argc() == 0;
     }
     UNREACHABLE();
     return true;
   }
 
   // Set a flag back to it's default value.
   void Reset() {
     switch (type_) {
       case TYPE_BOOL:
         *bool_variable() = bool_default();
         break;
       case TYPE_INT:
         *int_variable() = int_default();
         break;
       case TYPE_FLOAT:
         *float_variable() = float_default();
         break;
       case TYPE_STRING:
-        *string_variable() = string_default();
+        set_string_value(string_default(), false);
         break;
       case TYPE_ARGS:
         *args_variable() = args_default();
         break;
     }
   }
 };
 
 Flag flags[] = {
 #define FLAG_MODE_META
@@ skipping 25 matching lines @@
     case Flag::TYPE_BOOL:
       buffer.Add("%s", (*flag->bool_variable() ? "true" : "false"));
       break;
     case Flag::TYPE_INT:
       buffer.Add("%d", *flag->int_variable());
       break;
     case Flag::TYPE_FLOAT:
       buffer.Add("%f", FmtElm(*flag->float_variable()));
       break;
     case Flag::TYPE_STRING: {
-      const char* str = *flag->string_variable();
+      const char* str = flag->string_value();
       buffer.Add("%s", str ? str : "NULL");
       break;
     }
     case Flag::TYPE_ARGS: {
       JSArguments args = *flag->args_variable();
       if (args.argc() > 0) {
         buffer.Add("%s",  args[0]);
         for (int i = 1; i < args.argc(); i++) {
           buffer.Add(" %s", args[i]);
         }
@@ skipping 171 matching lines @@
         case Flag::TYPE_BOOL:
           *flag->bool_variable() = !is_bool;
           break;
         case Flag::TYPE_INT:
           *flag->int_variable() = strtol(value, &endp, 10);  // NOLINT
           break;
         case Flag::TYPE_FLOAT:
           *flag->float_variable() = strtod(value, &endp);
           break;
         case Flag::TYPE_STRING:
-          *flag->string_variable() = value;
+          flag->set_string_value(value ? StrDup(value) : NULL, true);
           break;
         case Flag::TYPE_ARGS: {
           int start_pos = (value == NULL) ? i : i - 1;
           int js_argc = *argc - start_pos;
           const char** js_argv = NewArray<const char*>(js_argc);
           if (value != NULL) {
-            js_argv[0] = value;
+            js_argv[0] = StrDup(value);
           }
           for (int k = i; k < *argc; k++) {
-            js_argv[k - start_pos] = argv[k];
+            js_argv[k - start_pos] = StrDup(argv[k]);
           }
           *flag->args_variable() = JSArguments(js_argc, js_argv);
           i = *argc;  // Consume all arguments
           break;
         }
       }
 
       // handle errors
       if ((flag->type() == Flag::TYPE_BOOL && value != NULL) ||
           (flag->type() != Flag::TYPE_BOOL && is_bool) ||
@@ skipping 71 matching lines @@
     p = SkipBlackSpace(p);
     if (*p != '\0') *p++ = '\0';  // 0-terminate argument
     p = SkipWhiteSpace(p);
   }
 
   // set the flags
   int result = SetFlagsFromCommandLine(&argc, argv, false);
 
   // cleanup
   DeleteArray(argv);
-  // don't delete copy0 since the substrings
-  // may be pointed to by FLAG variables!
-  // (this is a memory leak, but it's minor since this
-  // code is only used for debugging, or perhaps once
-  // during initialization).
+  DeleteArray(copy0);
 
   return result;
 }
 
 
 // static
 void FlagList::ResetAllFlags() {
   for (size_t i = 0; i < num_flags; ++i) {
     flags[i].Reset();
   }
@@ skipping 31 matching lines @@
 const char** JSArguments::argv() { return argv_; }
 const char*& JSArguments::operator[](int idx) { return argv_[idx]; }
 JSArguments& JSArguments::operator=(JSArguments args) {
     argc_ = args.argc_;
     argv_ = args.argv_;
     return *this;
 }
 
 
 } }  // namespace v8::internal