automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@37432 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 3 insertions, 1 deletions

diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index 6e482b540..6ece9d7e0 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -1745,7 +1745,9 @@ static int pbx_load_module(void)
 								}
 							}
 							free(tc);
-						} else fprintf(stderr,"Error strdup returned NULL in %s\n",__PRETTY_FUNCTION__);
+						} else {
+							ast_log(LOG_ERROR, "Memory allocation failure\n");
+						}
 					} else if(!strcasecmp(v->name, "include")) {
 						memset(realvalue, 0, sizeof(realvalue));
 						pbx_substitute_variables_helper(NULL, v->value, realvalue, sizeof(realvalue) - 1);