--- cfengine/trunk/src/filenames.c      2005-01-19 11:05:02.000000000 -0800
+++ cfengine-2.1.12/src/filenames.c     2005-01-23 21:58:57.337136280 -0800
@@ -221,10 +221,16 @@
 
 char *CanonifyName(char *str)
 
-{ static char buffer[CF_BUFSIZE];
+{ char *buffer;
   char *sp;
 
-memset(buffer,0,CF_BUFSIZE);
+if ( (buffer = malloc(CF_BUFSIZE)) == NULL)
+{
+   snprintf(OUTPUT,CF_BUFSIZE*2,"Couldn't malloc for CanonifyName");
+   CfLog(cferror,OUTPUT,"");
+   return false;
+}
+
 strcpy(buffer,str);
 
 for (sp = buffer; *sp != '\0'; sp++)