diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2012-05-11 11:08:38 +0200 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2012-05-11 11:08:38 +0200 |
| commit | 2193ea32f62c4394be13e2950896f49e01e1d14f (patch) | |
| tree | d6eb101c3b0e8b841b385b90f1152977c8671c86 | |
| parent | 0b4069c91f5bcc29a4ca81356d12db4e71ec1f7a (diff) | |
| download | vdr-2193ea32f62c4394be13e2950896f49e01e1d14f.tar.gz vdr-2193ea32f62c4394be13e2950896f49e01e1d14f.tar.bz2 | |
Making sure setup strings don't contain any newline characters
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 4 | ||||
| -rw-r--r-- | config.c | 8 |
3 files changed, 8 insertions, 5 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index c6f888d4..d3ceff3c 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1784,6 +1784,7 @@ Joachim Wilke <vdr@joachim-wilke.de> for modifying cCharSetConv so that it can be used to convert from "whatever VDR uses" to a given code for adding some missing 'const' to cDevice + for making sure setup strings don't contain any newline characters Sascha Klek <sklek@gmx.de> for reporting a problem with the '0' key in the "Day" item of the "Timers" menu @@ -7052,7 +7052,7 @@ Video Disk Recorder Revision History - Fixed handling IDLEPRIORITY in cDvbDevice::ProvidesChannel() (thanks to Frank Schmirler). -2012-05-08: Version 1.7.28 +2012-05-11: Version 1.7.28 - Fixed cPixmapMemory::DrawEllipse() for quadrants -1 and -4. - Fixed getting the maximum short channel name length in case there are no short names @@ -7102,3 +7102,5 @@ Video Disk Recorder Revision History - Removed the "bondedMasterFailed" mechanism from cDvbTuner, because it caused problems with the EPG scan in case a transponder is not receivable in a setup with bonded devices (reported by Michael Schneider). +- Making sure setup strings don't contain any newline characters (thanks to Joachim + Wilke). @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.c 2.21 2012/04/15 09:52:14 kls Exp $ + * $Id: config.c 2.22 2012/05/11 11:06:57 kls Exp $ */ #include "config.h" @@ -309,9 +309,9 @@ cSetupLine::cSetupLine(void) cSetupLine::cSetupLine(const char *Name, const char *Value, const char *Plugin) { - name = strdup(Name); - value = strdup(Value); - plugin = Plugin ? strdup(Plugin) : NULL; + name = strreplace(strdup(Name), '\n', 0); + value = strreplace(strdup(Value), '\n', 0); + plugin = Plugin ? strreplace(strdup(Plugin), '\n', 0) : NULL; } cSetupLine::~cSetupLine() |