Index: gwlib/octstr.c
===================================================================
RCS file: /home/cvs/gateway/gwlib/octstr.c,v
retrieving revision 1.157
diff -u -r1.157 octstr.c
--- gwlib/octstr.c	23 Jan 2004 11:46:36 -0000	1.157
+++ gwlib/octstr.c	3 Mar 2004 09:05:02 -0000
@@ -1168,6 +1168,8 @@
 
 void octstr_insert(Octstr *ostr1, const Octstr *ostr2, long pos)
 {
+    if (ostr2 == NULL)
+        return;
     seems_valid(ostr1);
     seems_valid(ostr2);
     gw_assert(pos <= ostr1->len);
@@ -1637,6 +1639,8 @@
     int all_safe;
     unsigned char c, *str, *str2, *res, *hexits;
 
+    if (ostr == NULL)
+        return;
     seems_valid(ostr);
 
     if (ostr->immutable || ostr->len == 0)
@@ -1706,6 +1710,8 @@
     unsigned char *dptr = ostr->data;
     int code, code2, ret = 0;
 
+    if (ostr == NULL)
+        return;
     seems_valid(ostr);
     gw_assert(!ostr->immutable);