diff --git a/lib/ChangeLog b/lib/ChangeLog
index 065cddd..07eb21d 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -2,6 +2,7 @@
 
 	* if.h: Add more 'non-generic' IFF_ flags.
 	* if.c: IFF_NOXMIT/IFF_VIRTUAL interfaces are 'loopback like'
+	* stream.c: Dont allocate streams with 0 sized data buffers
 
 2004-12-17 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
diff --git a/lib/stream.c b/lib/stream.c
index 2d4de76..1b85b13 100644
--- a/lib/stream.c
+++ b/lib/stream.c
@@ -46,6 +46,11 @@
 {
   struct stream *s;
 
+  assert (size > 0);
+  
+  if (size == 0)
+    return NULL;
+  
   s = XCALLOC (MTYPE_STREAM, sizeof (struct stream));
 
   s->data = XCALLOC (MTYPE_STREAM_DATA, size);