Index: main/file.c
===================================================================
--- main/file.c	(revision 105549)
+++ main/file.c	(working copy)
@@ -455,6 +455,11 @@
 	return res;
 }
 
+static int is_absolute_path(const char *filename)
+{
+	return filename[0] == '/';
+}
+
 /*!
  * \brief helper routine to locate a file with a given format
  * and language preference.
@@ -470,53 +475,54 @@
 			   char *buf, int buflen)
 {
 	int res = -1;
-	int langlen;	/* length of language string */
 	const char *c = strrchr(filename, '/');
 	int offset = c ? c - filename + 1 : 0;	/* points right after the last '/' */
 
-	if (preflang == NULL) {
-		preflang = "";
+	if (buf == NULL) {
+		return -1;
 	}
-	langlen = strlen(preflang);
-	
-	if (buflen < langlen + strlen(filename) + 4) {
-		ast_log(LOG_WARNING, "buffer too small, allocating larger buffer\n");
-		buf = alloca(langlen + strlen(filename) + 4);	/* room for everything */
+
+	if (ast_strlen_zero(preflang)) {
+		preflang = NULL;
 	}
 
-	if (buf == NULL) {
-		return 0;
+	if (is_absolute_path(filename)) {
+		ast_copy_string(buf, filename, buflen);
+		return ast_filehelper(buf, NULL, fmt, ACTION_EXISTS);
 	}
 
 	for (;;) {
 		if (ast_language_is_prefix) { /* new layout */
-			if (langlen) {
-				strcpy(buf, preflang);
-				buf[langlen] = '/';
-				strcpy(buf + langlen + 1, filename);
+			if (preflang) {
+				snprintf(buf, buflen, "%s/%s", preflang, filename);
 			} else {
-				strcpy(buf, "en/"); /* English - fallback if no file found in preferred language */
-				strcpy(buf + 3, filename);
+				snprintf(buf, buflen, "%s", filename);
 			}
 		} else { /* old layout */
 			strcpy(buf, filename);	/* first copy the full string */
-			if (langlen) {
+			if (preflang) {
 				/* insert the language and suffix if needed */
-				strcpy(buf + offset, preflang);
-				sprintf(buf + offset + langlen, "/%s", filename + offset);
+				snprintf(buf + offset, buflen - offset, "%s/%s", preflang, filename + offset);
 			}
 		}
 		res = ast_filehelper(buf, NULL, fmt, ACTION_EXISTS);
 		if (res > 0) {		/* found format */
 			break;
 		}
-		if (langlen == 0) {	/* no more formats */
+		if (!preflang) {	/* no more formats */
 			break;
 		}
-		if (preflang[langlen] == '_') { /* we are on the local suffix */
-			langlen = 0;	/* try again with no language */
+		if ((c = strchr(preflang, '_'))) { /* we are on the local suffix */
+			int langlen = c - preflang + 1;
+			char *newlang = alloca(langlen);
+			if (newlang) {
+				ast_copy_string(newlang, preflang, langlen);
+			}
+			preflang = newlang;
+		} else if (strcmp(preflang, "en")) {
+			preflang = "en";
 		} else {
-			langlen = (c = strchr(preflang, '_')) ? c - preflang : 0;
+			preflang = NULL;	/* try again with no language */
 		}
 	}