RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

js: utils.getenv(): fix crash on undefined var

This commit is contained in:
Avi Halachmi (:avih) 2017-07-06 18:10:23 +03:00
parent 0922678fc4
commit fa857ac7bc
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DOCS/man/javascript.rst
View File

@ -196,7 +196,8 @@ Additional utilities
Like ``print`` but also expands objects and arrays recursively.
``mp.utils.getenv(name)``
Returns the value of the host environment variable ``name``, or empty str.
Returns the value of the host environment variable ``name``, or
``undefined`` if the variable is not defined.
``mp.utils.get_user_path(path)``
Expands (mpv) meta paths like ``~/x``, ``~~/y``, ``~~desktop/z`` etc.

7
player/javascript.c
View File

@ -981,7 +981,12 @@ static void script_write_file(js_State *J, void *af)
// args: env var name
static void script_getenv(js_State *J)
{
js_pushstring(J, getenv(js_tostring(J, 1)));
const char *v = getenv(js_tostring(J, 1));
if (v) {
js_pushstring(J, v);
} else {
js_pushundefined(J);
}
}
// args: as-filename, content-string, returns the compiled result as a function