diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-21 17:50:04 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-21 17:50:04 +0000 |
| commit | b14bdc5a1211fa53add7d87b9444b56576d6d2d8 (patch) | |
| tree | a0057e266407ad019e0b495dd566584d47b50da5 /apps/app_realtime.c | |
| parent | 52fb5814943bd6d7d314d8f88dbd71b2c8d61c24 (diff) | |
revert my pass through the tree to remove checks of the result of ast_strdupa
(revisions 8378 through 8381)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@8387 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_realtime.c')
| -rw-r--r-- | apps/app_realtime.c | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/apps/app_realtime.c b/apps/app_realtime.c index a88620ea6..9e83d2638 100644 --- a/apps/app_realtime.c +++ b/apps/app_realtime.c @@ -148,19 +148,20 @@ static int realtime_update_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); - family = ast_strdupa(data); - if ((colmatch = strchr(family,'|'))) { - crop_data(colmatch); - if ((value = strchr(colmatch,'|'))) { - crop_data(value); - if ((newcol = strchr(value,'|'))) { - crop_data(newcol); - if ((newval = strchr(newcol,'|'))) - crop_data(newval); + if ((family = ast_strdupa(data))) { + if ((colmatch = strchr(family,'|'))) { + crop_data(colmatch); + if ((value = strchr(colmatch,'|'))) { + crop_data(value); + if ((newcol = strchr(value,'|'))) { + crop_data(newcol); + if ((newval = strchr(newcol,'|'))) + crop_data(newval); + } } } } - if (!newval) { + if (! (family && value && colmatch && newcol && newval) ) { ast_log(LOG_ERROR,"Invalid input: usage %s\n",UUSAGE); res = -1; } else { @@ -192,16 +193,17 @@ static int realtime_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); - family = ast_strdupa(data); - if ((colmatch = strchr(family,'|'))) { - crop_data(colmatch); - if ((value = strchr(colmatch,'|'))) { - crop_data(value); - if ((prefix = strchr(value,'|'))) - crop_data(prefix); + if ((family = ast_strdupa(data))) { + if ((colmatch = strchr(family,'|'))) { + crop_data(colmatch); + if ((value = strchr(colmatch,'|'))) { + crop_data(value); + if ((prefix = strchr(value,'|'))) + crop_data(prefix); + } } } - if (!value) { + if (! (family && value && colmatch) ) { ast_log(LOG_ERROR,"Invalid input: usage %s\n",USAGE); res = -1; } else { |