diff --git a/ChangeLog b/ChangeLog
index 97412b0..561041e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,15 @@
 Version 1.6.16
 *******************************************************************************
 
+2012-03-05 Fabrice Fontaine <fabrice.fontaine(at)orange.com>
+
+	SF Bug Tracker id 3496581 - Memory leak in getServiceList
+
+	Submitted: Fabrice Fontaine ( ffontaine ) - 2012-03-03 08:43:23 PST
+
+	serviceNodeList is not freed if
+	current->next = malloc(sizeof(service_info)); returns NULL.
+
 2012-02-29 Fabrice Fontaine <fabrice.fontaine(at)orange.com>
 
 	SF Bug Tracker id 3495616 - Memory leak in ixmlElement_setAttributeNS
diff --git a/upnp/src/genlib/service_table/service_table.c b/upnp/src/genlib/service_table/service_table.c
index e925511..c48fc69 100644
--- a/upnp/src/genlib/service_table/service_table.c
+++ b/upnp/src/genlib/service_table/service_table.c
@@ -2,6 +2,7 @@
  *
  * Copyright (c) 2000-2003 Intel Corporation 
  * All rights reserved. 
+ * Copyright (c) 2012 France Telecom All rights reserved. 
  *
  * Redistribution and use in source and binary forms, with or without 
  * modification, are permitted provided that the following conditions are met: 
@@ -761,6 +762,7 @@ service_info *getServiceList(
 				}
 				if (!current) {
 					freeServiceList(head);
+					ixmlNodeList_free(serviceNodeList);
 					return NULL;
 				}
 				current->next = NULL;