You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2022/04/14 04:49:06 UTC
[incubator-nuttx] branch master updated: sched/environ: Ensure tg_envp terminated by double '\0'
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 701bbaac74 sched/environ: Ensure tg_envp terminated by double '\0'
701bbaac74 is described below
commit 701bbaac748b9455921016a23437decc647e03b0
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Apr 13 15:05:53 2022 +0800
sched/environ: Ensure tg_envp terminated by double '\0'
so we can compute the whole environ string length from it
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
sched/environ/env_dup.c | 4 ++--
sched/environ/env_removevar.c | 5 +----
sched/environ/env_setenv.c | 7 +++++--
sched/environ/env_unsetenv.c | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/sched/environ/env_dup.c b/sched/environ/env_dup.c
index 0a7bbeb7db..c6bddf6a73 100644
--- a/sched/environ/env_dup.c
+++ b/sched/environ/env_dup.c
@@ -94,7 +94,7 @@ int env_dup(FAR struct task_group_s *group)
{
/* There is an environment, duplicate it */
- envp = (FAR char *)group_malloc(group, envlen);
+ envp = (FAR char *)group_malloc(group, envlen + 1);
if (envp == NULL)
{
/* The parent's environment can not be inherited due to a
@@ -108,7 +108,7 @@ int env_dup(FAR struct task_group_s *group)
{
/* Duplicate the parent environment. */
- memcpy(envp, ptcb->group->tg_envp, envlen);
+ memcpy(envp, ptcb->group->tg_envp, envlen + 1);
}
}
diff --git a/sched/environ/env_removevar.c b/sched/environ/env_removevar.c
index 4149b301c9..04b7c87be7 100644
--- a/sched/environ/env_removevar.c
+++ b/sched/environ/env_removevar.c
@@ -83,10 +83,7 @@ int env_removevar(FAR struct task_group_s *group, FAR char *pvar)
* this is inefficient, but robably not high duty.
*/
- while (count-- > 0)
- {
- *dest++ = *src++;
- }
+ memmove(dest, src, count + 1);
/* Then set to the new allocation size. The caller is expected to
* call realloc at some point but we don't do that here because the
diff --git a/sched/environ/env_setenv.c b/sched/environ/env_setenv.c
index 5a959a14d0..3dbfb80f41 100644
--- a/sched/environ/env_setenv.c
+++ b/sched/environ/env_setenv.c
@@ -145,7 +145,8 @@ int setenv(FAR const char *name, FAR const char *value, int overwrite)
if (group->tg_envp)
{
newsize = group->tg_envsize + varlen;
- newenvp = (FAR char *)group_realloc(group, group->tg_envp, newsize);
+ newenvp = (FAR char *)group_realloc(group, group->tg_envp,
+ newsize + 1);
if (!newenvp)
{
ret = ENOMEM;
@@ -157,7 +158,7 @@ int setenv(FAR const char *name, FAR const char *value, int overwrite)
else
{
newsize = varlen;
- newenvp = (FAR char *)group_malloc(group, varlen);
+ newenvp = (FAR char *)group_malloc(group, varlen + 1);
if (!newenvp)
{
ret = ENOMEM;
@@ -167,6 +168,8 @@ int setenv(FAR const char *name, FAR const char *value, int overwrite)
pvar = newenvp;
}
+ newenvp[newsize] = '\0';
+
/* Save the new buffer and size */
group->tg_envp = newenvp;
diff --git a/sched/environ/env_unsetenv.c b/sched/environ/env_unsetenv.c
index 2a575739e3..2b6ba7e098 100644
--- a/sched/environ/env_unsetenv.c
+++ b/sched/environ/env_unsetenv.c
@@ -97,7 +97,7 @@ int unsetenv(FAR const char *name)
/* Reallocate the environment to reclaim a little memory */
newenvp = (FAR char *)group_realloc(group, group->tg_envp,
- newsize);
+ newsize + 1);
if (newenvp == NULL)
{