ncurses 6.0 - patch 20170311

[ncurses.git] / ncurses / tinfo / comp_error.c

diff --git a/ncurses/tinfo/comp_error.c b/ncurses/tinfo/comp_error.c
index ff0acc79981564ff47bcab52c9207286c16933ed..68d6e48a1dba88bb0992349da32bf14972cee0e0 100644 (file)
--- a/ncurses/tinfo/comp_error.c
+++ b/ncurses/tinfo/comp_error.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2012,2016 Free Software Foundation, Inc.              *

  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -41,7 +41,7 @@
 
 #include <tic.h>
 
 
 #include <tic.h>
 

-MODULE_ID("$Id: comp_error.c,v 1.36 2012/02/22 22:34:31 tom Exp $")
+MODULE_ID("$Id: comp_error.c,v 1.37 2016/09/10 20:26:29 tom Exp $")

 
 NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings = FALSE;
 NCURSES_EXPORT_VAR(int) _nc_curr_line = 0; /* current line # in input */
 
 NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings = FALSE;
 NCURSES_EXPORT_VAR(int) _nc_curr_line = 0; /* current line # in input */


@@ -66,12 +66,14 @@ _nc_set_source(const char *const name)
 NCURSES_EXPORT(void)
 _nc_set_type(const char *const name)
 {
 NCURSES_EXPORT(void)
 _nc_set_type(const char *const name)
 {

+#define MY_SIZE (size_t) MAX_NAME_SIZE

     if (TermType == 0)
     if (TermType == 0)

-       TermType = typeMalloc(char, MAX_NAME_SIZE + 1);
+       TermType = typeMalloc(char, MY_SIZE + 1);

     if (TermType != 0) {
        TermType[0] = '\0';
     if (TermType != 0) {
        TermType[0] = '\0';

-       if (name)
-           strncat(TermType, name, (size_t) MAX_NAME_SIZE);
+       if (name) {
+           _nc_STRNCAT(TermType, name, MY_SIZE, MY_SIZE);
+       }

     }
 }
 
     }
 }