memory leak, comments

common/fp_lib_table.cpp

@@ -388,6 +388,7 @@ std::string FP_LIB_TABLE::FormatOptions( const PROPERTIES* aProperties )
 
             // the separation between name and value is '='
             if( value.size() )
+            {
                 ret += '=';
 
                 for( std::string::const_iterator si = value.begin();  si != value.end();  ++si )
@@ -400,6 +401,7 @@ std::string FP_LIB_TABLE::FormatOptions( const PROPERTIES* aProperties )
                 }
             }
         }
+    }
 
     return ret;
 }

pcbnew/dialogs/dialog_fp_plugin_options.cpp

@@ -51,7 +51,7 @@ public:
 
         SetTitle( title );
 
-        // add Cut, Copy, and Paste to wxGrids
+        // add Cut, Copy, and Paste to wxGrid
         m_grid->PushEventHandler( new GRID_TRICKS( m_grid ) );
 
         string options = TO_UTF8( aOptions );
@@ -60,7 +60,8 @@ public:
 
         if( props )
         {
-            m_grid->AppendRows( props->size() );
+            if( props->size() > m_grid->GetNumberRows() )
+                m_grid->AppendRows( props->size() - m_grid->GetNumberRows() );
 
             int row = 0;
             for( PROPERTIES::const_iterator it = props->begin();  it != props->end();  ++it, ++row )
@@ -68,6 +69,8 @@ public:
                 m_grid->SetCellValue( row, 0, FROM_UTF8( it->first.c_str() ) );
                 m_grid->SetCellValue( row, 1, FROM_UTF8( it->second.c_str() ) );
             }
+
+            delete props;
         }
 
         if( !col_width_option )

scripts/kicad-install.sh

@@ -188,7 +188,6 @@ install_or_update()
 
 
 if [ $# -eq 1 -a "$1" == "--remove-sources" ]; then
-    # run this only once, kills .config & makes dirs
     echo "deleting $WORKING_TREES"
     rm_build_dir "$WORKING_TREES/kicad.bzr/build"
     rm_build_dir "$WORKING_TREES/kicad-lib.bzr/build"