Index: channels/chan_sip.c
===================================================================
--- channels/chan_sip.c	(revision 140020)
+++ channels/chan_sip.c	(working copy)
@@ -11951,7 +11951,11 @@
 		index = atoi(codecnum);
 		if((codec = ast_codec_pref_index(&peer->prefs, index))) {
 			ast_copy_string(buf, ast_getformatname(codec), len);
+		} else {
+			buf[0] = '\0';
 		}
+	} else {
+		buf[0] = '\0';
 	}
 
 	ASTOBJ_UNREF(peer, sip_destroy_peer);
Index: channels/chan_iax2.c
===================================================================
--- channels/chan_iax2.c	(revision 140020)
+++ channels/chan_iax2.c	(working copy)
@@ -10696,7 +10696,11 @@
 		index = atoi(codecnum);
 		if((codec = ast_codec_pref_index(&peer->prefs, index))) {
 			ast_copy_string(buf, ast_getformatname(codec), len);
+		} else {
+			buf[0] = '\0';
 		}
+	} else {
+		buf[0] = '\0';
 	}
 
 	peer_unref(peer);
Index: apps/app_speech_utils.c
===================================================================
--- apps/app_speech_utils.c	(revision 140020)
+++ apps/app_speech_utils.c	(working copy)
@@ -193,8 +193,11 @@
 	if (data == NULL || speech == NULL || !(result = find_result(speech->results, data)))
                 return -1;
 
-	if (result->text != NULL)
+	if (result->text != NULL) {
 		ast_copy_string(buf, result->text, len);
+	} else {
+		buf[0] = '\0';
+	}
 
         return 0;
 }
@@ -219,8 +222,11 @@
 	if (data == NULL || speech == NULL || !(result = find_result(speech->results, data)))
                 return -1;
 
-	if (result->grammar != NULL)
+	if (result->grammar != NULL) {
 		ast_copy_string(buf, result->grammar, len);
+	} else {
+		buf[0] = '\0';
+	}
 
         return 0;
 }
@@ -322,6 +328,8 @@
 		}
 		snprintf(tmp, sizeof(tmp), "%d", results);
 		ast_copy_string(buf, tmp, len);
+	} else {
+		buf[0] = '\0';
 	}
 
 	return 0;
Index: funcs/func_timeout.c
===================================================================
--- funcs/func_timeout.c	(revision 140020)
+++ funcs/func_timeout.c	(working copy)
@@ -80,7 +80,7 @@
 
 	default:
 		ast_log(LOG_ERROR, "Unknown timeout type specified.\n");
-		break;
+		return -1;
 	}
 
 	return 0;
Index: funcs/func_math.c
===================================================================
--- funcs/func_math.c	(revision 140020)
+++ funcs/func_math.c	(working copy)
@@ -78,14 +78,14 @@
 	);
 
 	if (ast_strlen_zero(parse)) {
-		ast_log(LOG_WARNING, "Syntax: Math(<number1><op><number 2>[,<type_of_result>]) - missing argument!\n");
+		ast_log(LOG_WARNING, "Syntax: MATH(<number1><op><number 2>[,<type_of_result>]) - missing argument!\n");
 		return -1;
 	}
 
 	AST_STANDARD_APP_ARGS(args, parse);
 
 	if (args.argc < 1) {
-		ast_log(LOG_WARNING, "Syntax: Math(<number1><op><number 2>[,<type_of_result>]) - missing argument!\n");
+		ast_log(LOG_WARNING, "Syntax: MATH(<number1><op><number 2>[,<type_of_result>]) - missing argument!\n");
 		return -1;
 	}
 
Index: funcs/func_groupcount.c
===================================================================
--- funcs/func_groupcount.c	(revision 140020)
+++ funcs/func_groupcount.c	(working copy)
@@ -39,6 +39,7 @@
 static int group_count_function_read(struct ast_channel *chan, char *cmd,
 				     char *data, char *buf, size_t len)
 {
+	int ret = -1;
 	int count = -1;
 	char group[80] = "", category[80] = "";
 
@@ -64,12 +65,14 @@
 		ast_app_group_list_unlock();
 	}
 
-	if ((count = ast_app_group_get_count(group, category)) == -1)
+	if ((count = ast_app_group_get_count(group, category)) == -1) {
 		ast_log(LOG_NOTICE, "No group could be found for channel '%s'\n", chan->name);
-	else
+	} else {
 		snprintf(buf, len, "%d", count);
+		ret = 0;
+	}
 
-	return 0;
+	return ret;
 }
 
 static struct ast_custom_function group_count_function = {
@@ -96,9 +99,10 @@
 	if (!ast_strlen_zero(group)) {
 		count = ast_app_group_match_get_count(group, category);
 		snprintf(buf, len, "%d", count);
+		return 0;
 	}
 
-	return 0;
+	return -1;
 }
 
 static struct ast_custom_function group_match_count_function = {
@@ -116,6 +120,7 @@
 static int group_function_read(struct ast_channel *chan, char *cmd,
 			       char *data, char *buf, size_t len)
 {
+	int ret = -1;
 	struct ast_group_info *gi = NULL;
 	
 	ast_app_group_list_lock();
@@ -129,12 +134,14 @@
 			break;
 	}
 	
-	if (gi)
+	if (gi) {
 		ast_copy_string(buf, gi->group, len);
+		ret = 0;
+	}
 	
 	ast_app_group_list_unlock();
 	
-	return 0;
+	return ret;
 }
 
 static int group_function_write(struct ast_channel *chan, char *cmd,
Index: funcs/func_curl.c
===================================================================
--- funcs/func_curl.c	(revision 140020)
+++ funcs/func_curl.c	(working copy)
@@ -97,6 +97,7 @@
 
 static int curl_internal(struct MemoryStruct *chunk, char *url, char *post)
 {
+	int ret;
 	CURL **curl;
 
 	if (!(curl = ast_threadstorage_get(&curl_instance, sizeof(*curl))))
@@ -119,16 +120,17 @@
 		curl_easy_setopt(*curl, CURLOPT_POSTFIELDS, post);
 	}
 
-	curl_easy_perform(*curl);
+	ret = curl_easy_perform(*curl);
 
 	if (post)
 		curl_easy_setopt(*curl, CURLOPT_POST, 0);
 
-	return 0;
+	return ret ? -1 : 0;
 }
 
 static int acf_curl_exec(struct ast_channel *chan, char *cmd, char *info, char *buf, size_t len)
 {
+	int ret = -1;
 	struct ast_module_user *u;
 	struct MemoryStruct chunk = { NULL, 0 };
 	AST_DECLARE_APP_ARGS(args,
@@ -159,6 +161,7 @@
 			ast_copy_string(buf, chunk.memory, len);
 			free(chunk.memory);
 		}
+		ret = 0;
 	} else {
 		ast_log(LOG_ERROR, "Cannot allocate curl structure\n");
 	}
@@ -168,7 +171,7 @@
 
 	ast_module_user_remove(u);
 
-	return 0;
+	return ret;
 }
 
 struct ast_custom_function acf_curl = {
Index: funcs/func_odbc.c
===================================================================
--- funcs/func_odbc.c	(revision 140020)
+++ funcs/func_odbc.c	(working copy)
@@ -218,7 +218,7 @@
 	struct odbc_obj *obj;
 	struct acf_odbc_query *query;
 	char sql[2048] = "", varname[15];
-	int res, x, buflen = 0, escapecommas, bogus_chan = 0;
+	int res, x, buflen = 1, escapecommas, bogus_chan = 0;
 	AST_DECLARE_APP_ARGS(args,
 		AST_APP_ARG(field)[100];
 	);
Index: funcs/func_cdr.c
===================================================================
--- funcs/func_cdr.c	(revision 140020)
+++ funcs/func_cdr.c	(working copy)
@@ -88,7 +88,7 @@
 		       ast_test_flag(&flags, OPT_RECURSIVE),
 			   ast_test_flag(&flags, OPT_UNPARSED));
 
-	return 0;
+	return ret ? 0 : -1;
 }
 
 static int cdr_write(struct ast_channel *chan, char *cmd, char *parse,
Index: funcs/func_callerid.c
===================================================================
--- funcs/func_callerid.c	(revision 140020)
+++ funcs/func_callerid.c	(working copy)
@@ -41,6 +41,7 @@
 static int callerid_read(struct ast_channel *chan, char *cmd, char *data,
 			 char *buf, size_t len)
 {
+	int res = -1;
 	char *opt = data;
 
 	if (!chan)
@@ -54,12 +55,15 @@
 
 		if (!strncasecmp("all", data, 3)) {
 			snprintf(buf, len, "\"%s\" <%s>", name, num);
+			res = 0;
 		} else if (!strncasecmp("name", data, 4)) {
 			ast_copy_string(buf, name, len);
+			res = 0;
 		} else if (!strncasecmp("num", data, 3) ||
 			   !strncasecmp("number", data, 6)) {
 
 			ast_copy_string(buf, num, len);
+			res = 0;
 		} else {
 			ast_log(LOG_ERROR, "Unknown callerid data type '%s'.\n", data);
 		}
@@ -70,26 +74,32 @@
 			snprintf(buf, len, "\"%s\" <%s>",
 				 S_OR(chan->cid.cid_name, ""),
 				 S_OR(chan->cid.cid_num, ""));
+			res = 0;
 		} else if (!strncasecmp("name", data, 4)) {
 			if (chan->cid.cid_name) {
 				ast_copy_string(buf, chan->cid.cid_name, len);
+				res = 0;
 			}
 		} else if (!strncasecmp("num", data, 3)
 				   || !strncasecmp("number", data, 6)) {
 			if (chan->cid.cid_num) {
 				ast_copy_string(buf, chan->cid.cid_num, len);
+				res = 0;
 			}
 		} else if (!strncasecmp("ani", data, 3)) {
 			if (chan->cid.cid_ani) {
 				ast_copy_string(buf, chan->cid.cid_ani, len);
+				res = 0;
 			}
 		} else if (!strncasecmp("dnid", data, 4)) {
 			if (chan->cid.cid_dnid) {
 				ast_copy_string(buf, chan->cid.cid_dnid, len);
+				res = 0;
 			}
 		} else if (!strncasecmp("rdnis", data, 5)) {
 			if (chan->cid.cid_rdnis) {
 				ast_copy_string(buf, chan->cid.cid_rdnis, len);
+				res = 0;
 			}
 		} else {
 			ast_log(LOG_ERROR, "Unknown callerid data type '%s'.\n", data);
@@ -98,7 +108,7 @@
 		ast_channel_unlock(chan);
 	}
 
-	return 0;
+	return res;
 }
 
 static int callerid_write(struct ast_channel *chan, char *cmd, char *data,
Index: res/res_smdi.c
===================================================================
--- res/res_smdi.c	(revision 140020)
+++ res/res_smdi.c	(working copy)
@@ -1265,7 +1265,7 @@
 return_error:
 	ast_module_user_remove(u);
 
-	return 0;
+	return res;
 }
 
 static struct ast_custom_function smdi_msg_retrieve_function = {