security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

* xreadline.c: New. Based on the iobuf_read_line function.

Browse source 
* no-libgcrypt.c (gcry_realloc, gcry_xmalloc, gcry_xcalloc): New.

* gpgconf-comp.c (retrieve_options_from_program)
(retrieve_options_from_file, change_options_file)
(change_options_program, gc_component_change_options): Replaced
getline by read_line and test for allocation failure.
This commit is contained in:
Werner Koch 2004-06-14 08:32:07 +00:00
parent 5836ea925a
commit feb40e2c6e
7 changed files with 183 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tools/ChangeLog
View file

@ -1,3 +1,12 @@
2004-06-14 Werner Koch <wk@gnupg.org>
* no-libgcrypt.c (gcry_realloc, gcry_xmalloc, gcry_xcalloc): New.
* gpgconf-comp.c (retrieve_options_from_program)
(retrieve_options_from_file, change_options_file)
(change_options_program, gc_component_change_options): Replaced
getline by read_line and test for allocation failure.
2004-05-21 Marcus Brinkmann <marcus@g10code.de>
* gpgconf-comp.c (gc_options_dirmngr): Remove CRL group, put its

62
tools/gpgconf-comp.c
View file

@ -42,13 +42,6 @@
/* TODO:
Portability - Add gnulib replacements for getline, etc.
XXX Marcus: Please use the read_line code from dirmngr/src/http.c - it
has been in use for may years and provides the ability to limit the
length of the line and thus thwart DoS (not a issue here but at many
other places).
Components: Add more components and their options.
Robustness: Do more validation. Call programs to do validation for us.
Don't use popen, as this will not tell us if the program had a
@ -1252,7 +1245,7 @@ retrieve_options_from_program (gc_component_t component, gc_backend_t backend)
if (!config)
gc_error (1, errno, "could not gather active options from %s", cmd_line);
while ((length = getline (&line, &line_len, config)) > 0)
while ((length = read_line (config, &line, &line_len, NULL)) > 0)
{
gc_option_t *option;
char *linep;
@ -1319,7 +1312,7 @@ retrieve_options_from_program (gc_component_t component, gc_backend_t backend)
option->default_value = xstrdup (default_value);
}
}
if (ferror (config))
if (length < 0 || ferror (config))
gc_error (1, errno, "error reading from %s", cmd_line);
if (fclose (config) && ferror (config))
gc_error (1, errno, "error closing %s", cmd_line);
@ -1334,7 +1327,7 @@ retrieve_options_from_program (gc_component_t component, gc_backend_t backend)
config_pathname);
else
{
while ((length = getline (&line, &line_len, config)) > 0)
while ((length = read_line (config, &line, &line_len, NULL)) > 0)
{
char *name;
char *value;
@ -1415,14 +1408,13 @@ retrieve_options_from_program (gc_component_t component, gc_backend_t backend)
}
}
if (ferror (config))
if (length < 0 || ferror (config))
gc_error (1, errno, "error reading from %s", config_pathname);
if (fclose (config) && ferror (config))
gc_error (1, errno, "error closing %s", config_pathname);
}
if (line)
free (line);
xfree (line);
}
@ -1451,7 +1443,7 @@ retrieve_options_from_file (gc_component_t component, gc_backend_t backend)
else
{
while ((length = getline (&line, &line_len, list_file)) > 0)
while ((length = read_line (list_file, &line, &line_len, NULL)) > 0)
{
char *start;
char *end;
@ -1484,15 +1476,14 @@ retrieve_options_from_file (gc_component_t component, gc_backend_t backend)
else
list = xasprintf ("\"%s", percent_escape (start));
}
if (ferror (list_file))
if (length < 0 || ferror (list_file))
gc_error (1, errno, "can not read list file %s", list_pathname);
}
list_option->active = 1;
list_option->value = list;
if (line)
free (line);
xfree (line);
}
@ -1735,7 +1726,7 @@ change_options_file (gc_component_t component, gc_backend_t backend,
if (!dest_file)
goto change_file_one_err;
while ((length = getline (&line, &line_len, dest_file)) > 0)
while ((length = read_line (dest_file, &line, &line_len, NULL)) > 0)
{
int disable = 0;
char *start;
@ -1823,7 +1814,7 @@ change_options_file (gc_component_t component, gc_backend_t backend,
goto change_file_one_err;
}
}
if (ferror (dest_file))
if (length < 0 || ferror (dest_file))
goto change_file_one_err;
}
@ -1889,17 +1880,18 @@ change_options_file (gc_component_t component, gc_backend_t backend,
}
if (dest_file)
{
while ((length = getline (&line, &line_len, dest_file)) > 0)
while ((length = read_line (dest_file, &line, &line_len, NULL)) > 0)
{
fprintf (src_file, "%s", line);
if (ferror (src_file))
goto change_file_one_err;
}
if (ferror (dest_file))
if (length < 0 || ferror (dest_file))
goto change_file_one_err;
}
if (line)
free (line);
xfree (line);
line = NULL;
res = fclose (src_file);
if (res)
{
@ -1920,8 +1912,7 @@ change_options_file (gc_component_t component, gc_backend_t backend,
return 0;
change_file_one_err:
if (line)
free (line);
xfree (line);
res = errno;
if (src_file)
{
@ -1999,7 +1990,7 @@ change_options_program (gc_component_t component, gc_backend_t backend,
if (!dest_file)
goto change_one_err;
while ((length = getline (&line, &line_len, dest_file)) > 0)
while ((length = read_line (dest_file, &line, &line_len, NULL)) > 0)
{
int disable = 0;
char *start;
@ -2054,7 +2045,7 @@ change_options_program (gc_component_t component, gc_backend_t backend,
goto change_one_err;
}
}
if (ferror (dest_file))
if (length < 0 || ferror (dest_file))
goto change_one_err;
}
@ -2172,17 +2163,18 @@ change_options_program (gc_component_t component, gc_backend_t backend,
}
if (dest_file)
{
while ((length = getline (&line, &line_len, dest_file)) > 0)
while ((length = read_line (dest_file, &line, &line_len, NULL)) > 0)
{
fprintf (src_file, "%s", line);
if (ferror (src_file))
goto change_one_err;
}
if (ferror (dest_file))
if (length < 0 || ferror (dest_file))
goto change_one_err;
}
if (line)
free (line);
xfree (line);
line = NULL;
res = fclose (src_file);
if (res)
{
@ -2203,8 +2195,7 @@ change_options_program (gc_component_t component, gc_backend_t backend,
return 0;
change_one_err:
if (line)
free (line);
xfree (line);
res = errno;
if (src_file)
{
@ -2241,7 +2232,7 @@ gc_component_change_options (int component, FILE *in)
orig_pathname[backend] = NULL;
}
while ((length = getline (&line, &line_len, in)) > 0)
while ((length = read_line (in, &line, &line_len, NULL)) > 0)
{
char *linep;
unsigned long flags = 0;
@ -2439,6 +2430,5 @@ gc_component_change_options (int component, FILE *in)
rename (orig_pathname[backend], backup_pathname);
}
if (line)
free (line);
xfree (line);
}

22
tools/no-libgcrypt.c
View file

@ -38,6 +38,12 @@ out_of_core (void)
}
void *
gcry_malloc (size_t n)
{
return malloc (n);
}
void *
gcry_xmalloc (size_t n)
{
@ -47,6 +53,13 @@ gcry_xmalloc (size_t n)
return p;
}
void *
gcry_realloc (void *a, size_t n)
{
return realloc (a, n);
}
void *
gcry_xrealloc (void *a, size_t n)
{
@ -56,6 +69,14 @@ gcry_xrealloc (void *a, size_t n)
return p;
}
void *
gcry_calloc (size_t n, size_t m)
{
return calloc (n, m);
}
void *
gcry_xcalloc (size_t n, size_t m)
{
@ -65,6 +86,7 @@ gcry_xcalloc (size_t n, size_t m)
return p;
}
char *
gcry_xstrdup (const char *string)
{