security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

common: Avoid warning about const char ** assignment.

Browse Source 
* common/mkdir_p.c (gnupg_amkdir_p): Also strdup first item.  Return
an error on malloc failure.
(gnupg_mkdir_p): Fix type of dirs and tmp_dirs.
--

The code was correct but it inhibits type checking.  Instead of
casting it seems easier to simply allocate also the the first item in
DIRS.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2015-10-18 19:37:41 +02:00
parent 5aa1b392b1
commit e64c805b0c
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/mkdir_p.c
View File

@ -53,16 +53,21 @@ gnupg_amkdir_p (const char **directory_components)
/* log_debug ("%s: %d directory components.\n", __func__, count); */
dirs = xtrycalloc (count, sizeof (char *));
dirs = xtrycalloc (count, sizeof *dirs);
if (!dirs)
return gpg_err_make (default_errsource, gpg_err_code_from_syserror ());
for (i = 0; directory_components[i]; i ++)
{
if (i == 0)
dirs[i] = directory_components[i];
dirs[i] = xtrystrdup (directory_components[i]);
else
dirs[i] = make_filename (dirs[i - 1], directory_components[i], NULL);
dirs[i] = make_filename_try (dirs[i-1], directory_components[i], NULL);
if (!dirs[i])
{
err = gpg_err_make (default_errsource, gpg_err_code_from_syserror ());
goto out;
}
/* log_debug ("%s: Directory %d: `%s'.\n", __func__, i, dirs[i]); */
}
@ -127,7 +132,7 @@ gnupg_amkdir_p (const char **directory_components)
}
out:
for (i = 1; i < count; i ++)
for (i = 0; i < count; i ++)
xfree (dirs[i]);
xfree (dirs);
@ -144,7 +149,7 @@ gnupg_mkdir_p (const char *directory_component, ...)
gpg_error_t err = 0;
int i;
int space = 1;
char **dirs;
const char **dirs;
dirs = xtrymalloc (space * sizeof (char *));
if (!dirs)
@ -157,7 +162,7 @@ gnupg_mkdir_p (const char *directory_component, ...)
{
if (i == space)
{
char **tmp_dirs;
const char **tmp_dirs;
space = 2 * space;
tmp_dirs = xtryrealloc (dirs, space * sizeof (char *));