 -		*(inbuf+2) = 0;
 -		fprintf(stderr, "inbuf = %o %o\n", *inbuf, *(inbuf+1));
 -		outbuf = my_malloc(outbytes + 1);
-+        inbuf = (char *) my_malloc(inbytes + 1);
++        inbuf = (char *) unrtf_malloc(inbytes + 1);
 +        *inbuf = *doublet;
 +        *(inbuf+1) = (unsigned char *) *(doublet+1);
 +        *(inbuf+2) = 0;
 +        fprintf(stderr, "inbuf = %o %o\n", *inbuf, *(inbuf+1));
-+        outbuf = my_malloc(outbytes + 1);
++        outbuf = unrtf_malloc(outbytes + 1);
  
  #if 0
  

-
diff -durpN unrtf-0.21.2.old/src/output.h unrtf-0.21.2/src/output.h
--- unrtf-0.21.2.old/src/output.h	2010-08-11 21:09:02.000000000 -0400
+++ unrtf-0.21.2/src/output.h	2012-03-13 16:38:41.327940973 -0400
@@ -44,227 +44,228 @@
 typedef Collection Aliases;
 

 	
diff -durpN unrtf-0.21.2.old/src/attr.c unrtf-0.21.2/src/attr.c
--- unrtf-0.21.2.old/src/attr.c	2010-07-03 22:30:58.000000000 -0400
+++ unrtf-0.21.2/src/attr.c	2012-08-21 13:38:56.717688715 -0400
@@ -1,23 +1,23 @@
 /*=============================================================================
-   GNU UnRTF, a command-line program to convert RTF documents to other formats.
