aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-09-24 10:04:24 +0200
committerMax Kellermann <max@duempel.org>2009-09-24 10:04:24 +0200
commitd657be33baa1619cc488beadae3e48872548a7c7 (patch)
tree6e42b458e198e6d7e29878f52800647dd2b2507b
parenta86f9b80357e30823ce9d3d486adcf4cd4e781dc (diff)
downloadmpd-d657be33baa1619cc488beadae3e48872548a7c7.tar.gz
mpd-d657be33baa1619cc488beadae3e48872548a7c7.tar.xz
mpd-d657be33baa1619cc488beadae3e48872548a7c7.zip
decoder/sidplay: pass GError** to g_file_get_contents()
The error handler dereferences GError*, but did not retrieve that object from g_file_get_contents().
-rw-r--r--src/decoder/sidplay_plugin.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/decoder/sidplay_plugin.cxx b/src/decoder/sidplay_plugin.cxx
index 5228dbe89..84afd7add 100644
--- a/src/decoder/sidplay_plugin.cxx
+++ b/src/decoder/sidplay_plugin.cxx
@@ -52,7 +52,8 @@ sidplay_init(const struct config_param *param)
songlength_file=config_get_block_string(param,
"songlength_database", NULL);
if(songlength_file) {
- if(g_file_get_contents(songlength_file, &songlen_data, &songlen_data_size, NULL)) {
+ if (g_file_get_contents(songlength_file, &songlen_data,
+ &songlen_data_size, &err)) {
/* replace any ; comment characters with # */
for(int i=0; i<songlen_data_size; i++)
if(songlen_data[i]==';') songlen_data[i]='#';