frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-03-01 10:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a crash in strreplace() for multiple replacements with strings of different lengths

Browse Source
This commit is contained in:
Klaus Schmidinger 2024-07-10 14:59:45 +02:00
parent 305735a886
commit 87410442b6
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -2574,6 +2574,8 @@ Markus Ehrnsperger <markus.ehrnsperger@googlemail.com>
for suggesting to enable unused devices to be put into a power save mode for suggesting to enable unused devices to be put into a power save mode
for a patch that was used to implement power save mode for cDvbDevice for a patch that was used to implement power save mode for cDvbDevice
for suggesting to add 'lnbPowerTurnedOn = false' to cDvbTuner::ProvidesFrontend() for suggesting to add 'lnbPowerTurnedOn = false' to cDvbTuner::ProvidesFrontend()
for reporting a crash in strreplace() for multiple replacements with strings of
different lengths
Werner Färber <w.faerber@gmx.de> Werner Färber <w.faerber@gmx.de>
for reporting a bug in handling the cPluginManager::Active() result when pressing for reporting a bug in handling the cPluginManager::Active() result when pressing

5
HISTORY
View File

@ -9939,3 +9939,8 @@ Video Disk Recorder Revision History
Ehrnsperger). Ehrnsperger).
- Added 'lnbPowerTurnedOn = false' to cDvbTuner::ProvidesFrontend() (suggested by - Added 'lnbPowerTurnedOn = false' to cDvbTuner::ProvidesFrontend() (suggested by
Markus Ehrnsperger). Markus Ehrnsperger).
2024-07-10:
- Fixed a crash in strreplace() for multiple replacements with strings of different
lengths (reported by Markus Ehrnsperger).

6
tools.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: tools.c 5.11 2024/06/21 06:27:20 kls Exp $ * $Id: tools.c 5.12 2024/07/10 14:50:07 kls Exp $
*/ */
#include "tools.h" #include "tools.h"
@ -169,8 +169,10 @@ char *strreplace(char *s, const char *s1, const char *s2)
} }
} }
char *sof = s + of; char *sof = s + of;
if (l2 != l1) if (l2 != l1) {
memmove(sof + l2, sof + l1, l - of - l1 + 1); memmove(sof + l2, sof + l1, l - of - l1 + 1);
l += l2 - l1;
}
memcpy(sof, s2, l2); memcpy(sof, s2, l2);
q = sof + l2; q = sof + l2;
} while (p = strstr(q, s1)); } while (p = strstr(q, s1));