diff options
author | 2016-03-21 08:27:06 +0100 | |
---|---|---|
committer | 2016-03-21 08:27:06 +0100 | |
commit | a99df788017c2bf5a56034d4f9152bf8ab95a168 (patch) | |
tree | 3beec27b413c75b8f9f88199519e45fd07959bf8 /src/osd/osdmini/minimisc.cpp | |
parent | b224d9a77ad6483daf2b60b75dbdc323a3bcd4b0 (diff) | |
parent | 3afd990226a2c647290579bebb5537bd0fd3faac (diff) |
Merge with master
Diffstat (limited to 'src/osd/osdmini/minimisc.cpp')
-rw-r--r-- | src/osd/osdmini/minimisc.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/osd/osdmini/minimisc.cpp b/src/osd/osdmini/minimisc.cpp index 9891447359b..fb4901ca461 100644 --- a/src/osd/osdmini/minimisc.cpp +++ b/src/osd/osdmini/minimisc.cpp @@ -103,9 +103,7 @@ int osd_setenv(const char *name, const char *value, int overwrite) //============================================================ // osd_subst_env //============================================================ -void osd_subst_env(char **dst, const char *src) +void osd_subst_env(std::string &dst, const std::string &src) { - *dst = (char *)osd_malloc_array(strlen(src) + 1); - if (*dst != nullptr) - strcpy(*dst, src); + dst = src; } |