security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-09-21 15:01:41 +02:00
Code Activity

gpgscm: Improve robustness and compatibility.

Browse Source 
* tests/gpgscm/ffi.c (do_getenv): Avoid gccism.
(do_mkdtemp): Handle errors.

Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2016-07-05 16:24:13 +02:00
parent b70d08827d
commit f26fe4f73e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/gpgscm/ffi.c
View File

@ -219,9 +219,11 @@ do_getenv (scheme *sc, pointer args)
{ {
FFI_PROLOG (); FFI_PROLOG ();
char *name; char *name;
char *value;
FFI_ARG_OR_RETURN (sc, char *, name, string, args); FFI_ARG_OR_RETURN (sc, char *, name, string, args);
FFI_ARGS_DONE_OR_RETURN (sc, args); FFI_ARGS_DONE_OR_RETURN (sc, args);
FFI_RETURN_STRING (sc, getenv (name) ?: ""); value = getenv (name);
FFI_RETURN_STRING (sc, value ? value : "");
} }
static pointer static pointer
@ -313,6 +315,7 @@ do_mkdtemp (scheme *sc, pointer args)
FFI_PROLOG (); FFI_PROLOG ();
char *template; char *template;
char buffer[128]; char buffer[128];
char *name;
FFI_ARG_OR_RETURN (sc, char *, template, string, args); FFI_ARG_OR_RETURN (sc, char *, template, string, args);
FFI_ARGS_DONE_OR_RETURN (sc, args); FFI_ARGS_DONE_OR_RETURN (sc, args);
@ -320,7 +323,10 @@ do_mkdtemp (scheme *sc, pointer args)
FFI_RETURN_ERR (sc, EINVAL); FFI_RETURN_ERR (sc, EINVAL);
strncpy (buffer, template, sizeof buffer); strncpy (buffer, template, sizeof buffer);
FFI_RETURN_STRING (sc, gnupg_mkdtemp (buffer)); name = gnupg_mkdtemp (buffer);
if (name == NULL)
FFI_RETURN_ERR (sc, gpg_error_from_syserror ());
FFI_RETURN_STRING (sc, name);
} }
static pointer static pointer