[ViewVC] Diff of: cvs/rxvt-unicode/src/salloc.C

Comparing rxvt-unicode/src/salloc.C (file contents):
Revision 1.6 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.9 by root, Mon Feb 20 22:40:35 2006 UTC

 /*--------------------------------*-C-*---------------------------------*
  * File:	salloc.C
  *----------------------------------------------------------------------*
  *
  * All portions of code are copyright by their respective author/s.
- * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
+ * 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.
     }
   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;
 }

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines