diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 89ee87b861d..b99961fc9c0 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -7,6 +7,10 @@ Wed May 13 14:24:38 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
         replace with `size_t i' at each location where it is used.
         (cplus_mangle_opname): change type of `i' from int to size_t.
 
+Fri May  1 04:26:25 1998  Peter Schauer <pes@regent.e-technik.tu-muenchen.de>
+
+	* cplus-dem.c (cplus_demangle_opname):  Initialize work.
+
 Mon Apr 27 15:53:30 EDT 1998 Andrew MacLeod <amacleod@cygnus.com>
 
 	* cplus-dem.c (demangle_qualified): Replace missing else.
diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c
index 8f6809100c5..c5bcc47664c 100644
--- a/libiberty/cplus-dem.c
+++ b/libiberty/cplus-dem.c
@@ -430,6 +430,7 @@ cplus_demangle_opname (opname, result, options)
   len = strlen(opname);
   result[0] = '\0';
   ret = 0;
+  memset ((char *) work, 0, sizeof (work));
   work->options = options;
   
   if (opname[0] == '_' && opname[1] == '_'