diff --git a/src/tm_mad/tm_common.sh b/src/tm_mad/tm_common.sh index 957027deff..5970606ffa 100644 --- a/src/tm_mad/tm_common.sh +++ b/src/tm_mad/tm_common.sh @@ -51,7 +51,7 @@ function fix_dir_slashes function get_compare_target { - echo "$1" | $SED 's/\/+/\//g' | $SED 's/\\/images$//' + echo "$1" | $SED 's/\/+/\//g' | $SED 's/\/images$//' } function full_src_and_dst_equal diff --git a/src/vnm/FixedLeases.cc b/src/vnm/FixedLeases.cc index fc14480c74..02a91462c2 100644 --- a/src/vnm/FixedLeases.cc +++ b/src/vnm/FixedLeases.cc @@ -365,13 +365,17 @@ int FixedLeases::update_lease(Lease * lease) int FixedLeases::add_leases(vector& vector_leases, string& error_msg) { - const VectorAttribute * single_attr_lease; + const VectorAttribute * single_attr_lease = 0; int rc = -1; string _mac; string _ip; - single_attr_lease = dynamic_cast(vector_leases[0]); + if ( vector_leases.size() > 0 ) + { + single_attr_lease = + dynamic_cast(vector_leases[0]); + } if( single_attr_lease != 0 ) { @@ -400,11 +404,15 @@ int FixedLeases::add_leases(vector& vector_leases, int FixedLeases::remove_leases(vector& vector_leases, string& error_msg) { - const VectorAttribute * single_attr_lease; + const VectorAttribute * single_attr_lease = 0; int rc = -1; string _ip; - single_attr_lease = dynamic_cast(vector_leases[0]); + if ( vector_leases.size() > 0 ) + { + single_attr_lease = + dynamic_cast(vector_leases[0]); + } if( single_attr_lease != 0 ) {