/****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey *
+ * Copyright 2018-2022,2023 Thomas E. Dickey *
* Copyright 1999-2016,2017 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
#include <tic.h>
-MODULE_ID("$Id: alloc_ttype.c,v 1.43 2022/05/29 17:56:55 tom Exp $")
+MODULE_ID("$Id: alloc_ttype.c,v 1.51 2023/09/09 23:15:53 tom Exp $")
#if NCURSES_XNAMES
/*
int j, k;
DEBUG(3, (T_CALLED("adjust_cancels(%s), from(%s)"),
- to ? NonNull(to->term_names) : "?",
- from ? NonNull(from->term_names) : "?"));
+ NonNull(to->term_names),
+ NonNull(from->term_names)));
for (j = first; j < last;) {
char *name = to->ext_Names[j];
int j_str = to->num_Strings - first - to->ext_Strings;
unsigned i;
int pass;
char *new_table;
+ size_t new_table_size;
#if NCURSES_EXT_NUMBERS
short *oldptr = 0;
int *newptr = 0;
NUM_STRINGS(dst) * sizeof(dst->Strings[0]));
new_table = NULL;
+ new_table_size = 0;
for (pass = 0; pass < 2; ++pass) {
size_t str_size = 0;
- if (pass) {
- dst->term_names = new_table + str_size;
- strcpy(dst->term_names + str_size, src->term_names);
+ if (src->term_names != NULL) {
+ if (pass) {
+ dst->term_names = new_table + str_size;
+ _nc_STRCPY(dst->term_names + str_size,
+ src->term_names,
+ new_table_size - str_size);
+ }
+ str_size += strlen(src->term_names) + 1;
}
- str_size += strlen(src->term_names) + 1;
- for (i = 0; i < STRCOUNT; ++i) {
+ for_each_string(i, src) {
if (VALID_STRING(src->Strings[i])) {
if (pass) {
- strcpy(new_table + str_size, src->Strings[i]);
+ _nc_STRCPY(new_table + str_size,
+ src->Strings[i],
+ new_table_size - str_size);
dst->Strings[i] = new_table + str_size;
}
str_size += strlen(src->Strings[i]) + 1;
dst->str_table = new_table;
} else {
++str_size;
- new_table = malloc(str_size);
+ if ((new_table = malloc(str_size)) == NULL)
+ _nc_err_abort(MSG_NO_MEMORY);
+ new_table_size = str_size;
}
}
memcpy(dst->ext_Names, src->ext_Names, i * sizeof(char *));
new_table = NULL;
+ new_table_size = 0;
for (pass = 0; pass < 2; ++pass) {
size_t str_size = 0;
char *raw_data = src->ext_str_table;
size_t skip = strlen(raw_data) + 1;
if (skip != 1) {
if (pass) {
- strcpy(new_table + str_size, raw_data);
+ _nc_STRCPY(new_table + str_size,
+ raw_data,
+ new_table_size - str_size);
}
str_size += skip;
raw_data += skip;
for (i = 0; i < NUM_EXT_NAMES(dst); ++i) {
if (VALID_STRING(src->ext_Names[i])) {
if (pass) {
- strcpy(new_table + str_size, src->ext_Names[i]);
+ _nc_STRCPY(new_table + str_size,
+ src->ext_Names[i],
+ new_table_size - str_size);
dst->ext_Names[i] = new_table + str_size;
}
str_size += strlen(src->ext_Names[i]) + 1;
dst->ext_str_table = new_table;
} else {
++str_size;
- new_table = calloc(str_size, 1);
+ if ((new_table = calloc(str_size, 1)) == NULL)
+ _nc_err_abort(MSG_NO_MEMORY);
+ new_table_size = str_size;
}
}
} else {
dst->ext_Names = 0;
}
#endif
+ (void) new_table_size;
DEBUG(2, (T_RETURN("")));
}
-/*
- * This entrypoint is used by tack 1.07
- */
NCURSES_EXPORT(void)
_nc_copy_termtype(TERMTYPE *dst, const TERMTYPE *src)
{