[svn-commits] kharwell: trunk r401328 - in /trunk: ./ main/editline/term.c

[SVN commits to the Digium repositories]

Author: kharwell
Date: Mon Oct 21 14:50:28 2013
New Revision: 401328

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=401328
Log:
Segfault in LIBEDIT_INTERNAL after tgetstr(), when libncurses5-dev
isn't installed

Include the appropriate declarations when not using termcap, but term+curses
and [n]curses do not exist.

(closes issue ASTERISK-22351)
Reported by: A. Iglesias
Patches:
    issueA22351_libedit_internal_without_ncurses_dev.patch uploaded by wdoekes (license 5674)
........

Merged revisions 401325 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 401326 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 401327 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/main/editline/term.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/main/editline/term.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/editline/term.c?view=diff&rev=401328&r1=401327&r2=401328
==============================================================================
--- trunk/main/editline/term.c (original)
+++ trunk/main/editline/term.c Mon Oct 21 14:50:28 2013
@@ -65,15 +65,17 @@
 #include <ncurses.h>
 #endif
 #if defined(HAVE_TERM_H)
+/* Can not use /usr/include/term.h because of a lot of incompatibilities, so just define some prototypes */
 #include "term.h"
-/* Can not use /usr/include/term.h because of a lot of incompatibilities, so just define some prototypes */
+#endif /* defined(HAVE_TERM_H) */
+#if defined(HAVE_TERM_H) || !(defined(HAVE_TERMCAP_H) || defined(HAVE_CURSES_H) || defined(HAVE_NCURSES_H))
 extern int tgetent(char *, const char *);
 extern int tgetflag(const char *);
 extern int tgetnum(const char *);
 extern char *tgetstr(const char *, char **);
 extern int tputs (const char *, int, int (*)(int));
 extern char *tgoto (const char *, int, int);
-#endif /* defined(HAVE_TERM_H) */
+#endif /* defined(HAVE_TERM_H) or none_of_the_others */
 #include <sys/types.h>
 #include <sys/ioctl.h>