diff options
| author | Paul Eggert | 2011-04-05 13:08:03 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-05 13:08:03 -0700 |
| commit | c136c10f5967fa2224d5d0d63681486161cc2aba (patch) | |
| tree | 4de7024f7a77ee972f6c11af1d2932ee92e9d8b7 /src | |
| parent | 5e2d4a30b2a30631701f8645cf4f626c7c765569 (diff) | |
| download | emacs-c136c10f5967fa2224d5d0d63681486161cc2aba.tar.gz emacs-c136c10f5967fa2224d5d0d63681486161cc2aba.zip | |
* sound.c (sound_warning): Don't crash if arg contains a printf format.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/sound.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3f2837d52f0..c46f6f37cde 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -2,6 +2,8 @@ | |||
| 2 | 2 | ||
| 3 | Fix more problems found by GCC 4.6.0's static checks. | 3 | Fix more problems found by GCC 4.6.0's static checks. |
| 4 | 4 | ||
| 5 | * sound.c (sound_warning): Don't crash if arg contains a printf format. | ||
| 6 | |||
| 5 | * image.c (tiff_error_handler, tiff_warning_handler): Mark as | 7 | * image.c (tiff_error_handler, tiff_warning_handler): Mark as |
| 6 | printf-like functions. | 8 | printf-like functions. |
| 7 | (tiff_load): Add casts to remove these marks before passing them | 9 | (tiff_load): Add casts to remove these marks before passing them |
diff --git a/src/sound.c b/src/sound.c index a2fe7ccc8ce..a972809e2c7 100644 --- a/src/sound.c +++ b/src/sound.c | |||
| @@ -344,7 +344,7 @@ sound_perror (const char *msg) | |||
| 344 | static void | 344 | static void |
| 345 | sound_warning (const char *msg) | 345 | sound_warning (const char *msg) |
| 346 | { | 346 | { |
| 347 | message (msg); | 347 | message ("%s", msg); |
| 348 | } | 348 | } |
| 349 | 349 | ||
| 350 | 350 | ||