diff --git a/HISTORY b/HISTORY
index f2944e70..0378a1f3 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9536,7 +9536,7 @@ Video Disk Recorder Revision History
   cDvbTuner::GetSignalStats() to avoid problems with drivers that don't do this
   (thanks to Helmut Binder).
 
-2020-12-16:
+2020-12-17:
 
 - Fixed multiple recording entries in case a recording is started during the initial
   reading of the video directory (reported by Claus Muus).
@@ -9557,3 +9557,5 @@ Video Disk Recorder Revision History
   Helmut Binder).
 - Fixed error handling when loading a plugin (reported by Markus Ehrnsperger).
 - Improved handling missing VDRPluginDestroyer() (thanks to Winfried Köhler).
+- Fixed initializing tmpbuf in ExtendedEventDescriptors::getText() (thanks to Helmut
+  Binder).
diff --git a/libsi/descriptor.c b/libsi/descriptor.c
index 9e2b39ce..edc26e3d 100644
--- a/libsi/descriptor.c
+++ b/libsi/descriptor.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.c 4.3 2020/06/23 09:27:09 kls Exp $
+ *   $Id: descriptor.c 4.4 2020/12/17 12:52:57 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -94,6 +94,7 @@ char *ExtendedEventDescriptors::getText(char *buffer, int size, const char *sepa
    char tmpbuf[tmpsize];
    const char *fromCode = NULL;
    int index=0, len;
+   *tmpbuf = 0; // just in case length is 0
    for (int i=0;i<length;i++) {
       ExtendedEventDescriptor *d=(ExtendedEventDescriptor *)array[i];
       if (!d)