Merge rgagnon's pedantic string changes (apps n-z) (bug #2038)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3429 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 21 insertions, 10 deletions

diff --git a/apps/app_striplsd.c b/apps/app_striplsd.c
index 600f0bdbf..82d513f85 100755
--- a/apps/app_striplsd.c
+++ b/apps/app_striplsd.c
@@ -45,16 +45,27 @@ LOCAL_USER_DECL;
 
 static int striplsd_exec(struct ast_channel *chan, void *data)
 {
-  char newexten[AST_MAX_EXTENSION] = "";
-  if (!data || !atoi(data)) {
-    ast_log(LOG_DEBUG, "Ignoring, since number of digits to strip is 0\n");
-    return 0;
-  }
-  if (strlen(chan->exten) > atoi(data)) {
-    strncpy(newexten, chan->exten, strlen(chan->exten)-atoi(data));
-  }
-  strncpy(chan->exten, newexten, sizeof(chan->exten)-1);
-  return 0;
+	char newexten[AST_MAX_EXTENSION] = "";
+	int maxbytes = 0;
+	int stripcount = 0;
+	int extlen = strlen(chan->exten);
+
+	maxbytes = sizeof(newexten) - 1;
+	if (data) {
+		stripcount = atoi(data);
+	}
+	if (!stripcount) {
+		ast_log(LOG_DEBUG, "Ignoring, since number of digits to strip is 0\n");
+		return 0;
+	}
+	if (extlen > stripcount) {
+		if (extlen - stripcount <= maxbytes) {
+			maxbytes = extlen - stripcount;
+		}
+		strncpy(newexten, chan->exten, maxbytes);
+	}
+	strncpy(chan->exten, newexten, sizeof(chan->exten)-1);
+	return 0;
 }
 
 int unload_module(void)