Commit cce1f561bed6db9c6d20690aa47bb3c79fe7ce3e - tlsh

Fixed potential buffer overflow warnings. Vic Hargrave 8 years ago

1 changed file(s) with 6 addition(s) and 6 deletion(s). Raw diff Collapse all Expand all

-6

test/tlsh_unittest.cpp less more

145	145	int n_file = 0;
146	146	while (dit != NULL) {
147	147	char tmp_fname[2000];
148		strncpy(tmp_fname, dirname, sizeof(tmp_fname));
149		strncat(tmp_fname, "/", sizeof(tmp_fname));
150		strncat(tmp_fname, dit->d_name, sizeof(tmp_fname));
	148	strncpy(tmp_fname, dirname, sizeof(tmp_fname)-1);
	149	strncat(tmp_fname, "/", sizeof(tmp_fname)-1);
	150	strncat(tmp_fname, dit->d_name, sizeof(tmp_fname)-1);
151	151	if (strlen(tmp_fname) < sizeof(tmp_fname) - 2) {
152	152	if (is_dir(tmp_fname) ) {
153	153	if ((strcmp(dit->d_name, ".") == 0) \|\| (strcmp(dit->d_name, "..") == 0)) {

179	179	dit = readdir(dip);
180	180	while (dit != NULL) {
181	181	char tmp_fname[2000];
182		strncpy(tmp_fname, dirname, sizeof(tmp_fname));
183		strncat(tmp_fname, "/", sizeof(tmp_fname));
184		strncat(tmp_fname, dit->d_name, sizeof(tmp_fname));
	182	strncpy(tmp_fname, dirname, sizeof(tmp_fname)-1);
	183	strncat(tmp_fname, "/", sizeof(tmp_fname)-1);
	184	strncat(tmp_fname, dit->d_name, sizeof(tmp_fname)-1);
185	185	// -2 for safety
186	186	if (strlen(tmp_fname) < sizeof(tmp_fname) - 2) {
187	187	if (is_dir(tmp_fname) ) {