summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--libio/fmemopen.c3
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2aeea7ac07..5033b24f73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-09-02  Andreas Jaeger  <aj@suse.de>
+
+	* sysdeps/unix/sysv/linux/mips/bits/fcntl.h: Fixes for fcntl64.
+
+	* libio/fmemopen.c (fmemopen_close): Revert one part of last
+	patch.
+
 2000-09-01  Ulrich Drepper  <drepper@redhat.com>
 
 	* iconvdata/big5hkscs.c: Regenerated from charmap.
diff --git a/libio/fmemopen.c b/libio/fmemopen.c
index bf996d4058..92df2e4424 100644
--- a/libio/fmemopen.c
+++ b/libio/fmemopen.c
@@ -183,7 +183,8 @@ fmemopen_close (void *cookie)
 
   c = (fmemopen_cookie_t *) cookie;
 
-  free (c->buffer);
+  if (c->mybuffer)
+    free (c->buffer);
   free (c);
 
   return 0;