--- rxvt-unicode/src/salloc.C	2003/12/17 09:00:35	1.1
+++ rxvt-unicode/src/salloc.C	2006/02/20 22:42:01	1.10
@@ -1,8 +1,30 @@
+/*----------------------------------------------------------------------*
+ * File:	salloc.C
+ *----------------------------------------------------------------------*
+ *
+ * All portions of code are copyright by their respective author/s.
+ * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *----------------------------------------------------------------------*/
+
 #include "salloc.h"
 
 #define SALLOC_BLOCK 65536 // size of basic block to allocate
 
-rxvt_salloc::rxvt_salloc (int size)
+rxvt_salloc::rxvt_salloc (unsigned int size)
 {
   this->size = size < sizeof (chain) ? sizeof (chain) : size;
   firstline = 0;
@@ -40,7 +62,7 @@
           firstfree = sizeof (chain);
         }
 
-      r = (void *)((char *)firstblock + firstfree);
+      r = (void *) ((char *)firstblock + firstfree);
 
       firstfree += size;
     }
@@ -48,9 +70,28 @@
   return r;
 }
 
+void *
+rxvt_salloc::alloc (void *data, unsigned int datalen)
+{
+  void *s = alloc ();
+
+  if (datalen < size)
+    {
+      memcpy (s, data, datalen);
+      memset ((unsigned char *)s + datalen, 0, size - datalen); // not strictly required for screen.C
+    }
+  else
+    memcpy (s, data, size);
+
+  return s;
+}
+
 void
 rxvt_salloc::free (void *data)
 {
+  if (!data)
+    return;
+
   chain *line = (chain *)data;
   line->next = firstline;
   firstline = line;