diff --git a/ChangeLog b/ChangeLog
index 562b57e..5907102 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,14 @@
 Version 1.6.16
 *******************************************************************************
 
+2012-03-05 Fabrice Fontaine <fabrice.fontaine(at)orange.com>
+
+	SF Bug Tracker id 3497009 - Resource leak in http_SendMessage
+
+	Submitted: Fabrice Fontaine ( ffontaine ) - 2012-03-05 05:51:44 PST
+
+	Fp is not closed if fseeko(Fp, Instr->RangeOffset, SEEK_CUR) does not return 0.
+
 2012-03-05 Fabrice Fontaine <fabrice.fontaine(at)orange.com>
 
 	HInfo->ServiceTable initialization in UpnpRegisterRootDevice2 and UpnpRegisterRootDevice4
diff --git a/upnp/src/genlib/net/http/httpreadwrite.c b/upnp/src/genlib/net/http/httpreadwrite.c
index 98f9411..2d88bba 100644
--- a/upnp/src/genlib/net/http/httpreadwrite.c
+++ b/upnp/src/genlib/net/http/httpreadwrite.c
@@ -403,12 +403,12 @@ int http_SendMessage(SOCKINFO *info, int *TimeOut, const char *fmt, ...)
 				if (virtualDirCallback.seek(Fp, Instr->RangeOffset,
 				    SEEK_CUR) != 0) {
 					RetVal = UPNP_E_FILE_READ_ERROR;
-					goto ExitFunction;
+					goto Cleanup_File;
 				}
 			} else if (Instr && Instr->IsRangeActive) {
 				if (fseeko(Fp, Instr->RangeOffset, SEEK_CUR) != 0) {
 					RetVal = UPNP_E_FILE_READ_ERROR;
-					goto ExitFunction;
+					goto Cleanup_File;
 				}
 			}
 			while (amount_to_be_read) {