diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index 5599801e68..16a56fc2b9 100644
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-08 Paul Jakma <paul.jakma@sun.com>
+
+	* bgp_community.c: (community_str2com) Coverity CID#62, fix
+	  double-free, use-after-free.
+
 2006-05-04 Paul Jakma <paul.jakma@sun.com>
 
 	* (general) VPNv4 fixes. Certain VPNv4 code was not enabled.
diff --git a/bgpd/bgp_community.c b/bgpd/bgp_community.c
index b419a203b7..07b8cf81f8 100644
--- a/bgpd/bgp_community.c
+++ b/bgpd/bgp_community.c
@@ -596,7 +596,7 @@ community_str2com (const char *str)
 	default:
 	  if (com)
 	    community_free (com);
-	  break;
+	  return NULL;
 	}
     } while (str);