From b600470787ac5c1b875a9418043f03b7d4006b18 Mon Sep 17 00:00:00 2001 From: ats Date: Fri, 18 Nov 1994 12:38:43 +0000 Subject: Makefile: Change the reference for the libtermcap libtermlib link from SHLIBDIR to LIBDIR. SHLIBDIR is undefined in the standard case. termcap.c: Initialize a local variable to zero. Otherwise an erroneous free call can happen and clobber the calling program. Seen with vi and gdb. If you have TERMCAP set with a terminal entry and set TERM with something like huhu, vi and gdb core dumps. --- lib/libtermcap/Makefile | 4 ++-- lib/libtermcap/termcap.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/libtermcap') diff --git a/lib/libtermcap/Makefile b/lib/libtermcap/Makefile index fbfa7f5..4fef3a1 100644 --- a/lib/libtermcap/Makefile +++ b/lib/libtermcap/Makefile @@ -9,8 +9,8 @@ MLINKS= termcap.3 tgetent.3 termcap.3 tgetflag.3 termcap.3 tgetnum.3 \ termcap.3 tgetstr.3 termcap.3 tgoto.3 termcap.3 tputs.3 LINKS= ${LIBDIR}/libtermcap.a ${LIBDIR}/libtermlib.a .if !defined(NOPIC) -LINKS+= ${SHLIBDIR}/libtermcap.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ - ${SHLIBDIR}/libtermlib.so.${SHLIB_MAJOR}.${SHLIB_MINOR} +LINKS+= ${LIBDIR}/libtermcap.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ + ${LIBDIR}/libtermlib.so.${SHLIB_MAJOR}.${SHLIB_MINOR} .endif .if !defined(NOPROFILE) LINKS+= ${LIBDIR}/libtermcap_p.a ${LIBDIR}/libtermlib_p.a diff --git a/lib/libtermcap/termcap.c b/lib/libtermcap/termcap.c index 708ccfa..51f0288 100644 --- a/lib/libtermcap/termcap.c +++ b/lib/libtermcap/termcap.c @@ -78,6 +78,7 @@ tgetent(bp, name) char **pvec; /* holds usable tail of path vector */ char *termpath; + dummy = NULL; fname = pathvec; pvec = pathvec; tbuf = bp; -- cgit v1.1