diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2012-09-17 01:41:34 -0700 |
|---|---|---|
| committer | Chia-chi Yeh <chiachi@android.com> | 2012-09-17 02:07:16 -0700 |
| commit | a0315adb1214a45a323e1ddf7c09faaa8ba0cdf5 (patch) | |
| tree | a73579db60679543368b1fe15e54d4c93b72ac3f | |
| parent | 981eda8baa70ed21c0db173d4a5d2d7fe12e4212 (diff) | |
| download | ipsec-tools-a0315adb1214a45a323e1ddf7c09faaa8ba0cdf5.tar.gz | |
ipsec-tools: fix possible SEGV in isakmp_cfg_setenv().
Bug: 6840474
Change-Id: Ic4e20e04f3f7b3b7857f32b8b7d9e4ebc6d8a0fe
| -rw-r--r-- | src/racoon/isakmp.c | 4 | ||||
| -rw-r--r-- | src/racoon/isakmp_unity.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/racoon/isakmp.c b/src/racoon/isakmp.c index 12eb5a0..b470b54 100644 --- a/src/racoon/isakmp.c +++ b/src/racoon/isakmp.c @@ -3123,6 +3123,10 @@ script_env_append(envp, envc, name, value) char **newenvp; int newenvc; + if (value == NULL) { + value = ""; + } + envitem = racoon_malloc(strlen(name) + 1 + strlen(value) + 1); if (envitem == NULL) { plog(LLV_ERROR, LOCATION, NULL, diff --git a/src/racoon/isakmp_unity.c b/src/racoon/isakmp_unity.c index 99e3f3e..815367d 100644 --- a/src/racoon/isakmp_unity.c +++ b/src/racoon/isakmp_unity.c @@ -405,7 +405,7 @@ char * splitnet_list_2str(list, splitnet_ipaddr) netentry = netentry->next; } - str[len-1]=0; + str[len]=0; return str; } |