Browse Source

[settings] Ensure fetch_string_setting() returns a NUL-terminated string

This fixes a regression introduced in commit 612f4e7:

  [settings] Avoid returning uninitialised data on error in fetch_xxx_setting()

in which the memset() was moved from fetch_string_setting() to
fetch_setting(), in order that it would be useful for non-string
setting types.  However, this neglects to take into account the fact
that fetch_string_setting() shrinks its buffer by one byte (to allow
for the NUL) before calling fetch_setting().

Restore the memset() in fetch_string_setting(), so that the
terminating NUL is guaranteed to actually be a NUL.
tags/v0.9.6
Michael Brown 16 years ago
parent
commit
ed196a3ed2
1 changed files with 1 additions and 0 deletions
  1. 1
    0
      src/core/settings.c

+ 1
- 0
src/core/settings.c View File

@@ -384,6 +384,7 @@ int fetch_setting_len ( struct settings *settings, struct setting *setting ) {
384 384
  */
385 385
 int fetch_string_setting ( struct settings *settings, struct setting *setting,
386 386
 			   char *data, size_t len ) {
387
+	memset ( data, 0, len );
387 388
 	return fetch_setting ( settings, setting, data,
388 389
 			       ( ( len > 0 ) ? ( len - 1 ) : 0 ) );
389 390
 }

Loading…
Cancel
Save