jcs's openbsd hax
openbsd

Just use sort_reallocarray() everywhere.

millert de2b9554 f34bf8e6

+7 -19
+3 -3
usr.bin/sort/file.c
··· 1 - /* $OpenBSD: file.c,v 1.12 2015/04/01 21:33:01 millert Exp $ */ 1 + /* $OpenBSD: file.c,v 1.13 2015/04/01 22:24:02 millert Exp $ */ 2 2 3 3 /*- 4 4 * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org> ··· 664 664 if (remsz > (READ_CHUNK >> 1)) { 665 665 search_start = fr->cbsz - fr->strbeg; 666 666 fr->cbsz += READ_CHUNK; 667 - fr->buffer = sort_realloc(fr->buffer, 668 - fr->cbsz); 667 + fr->buffer = sort_reallocarray(fr->buffer, 668 + 1, fr->cbsz); 669 669 bsz1 = fread(fr->buffer + fr->bsz, 1, 670 670 READ_CHUNK, fr->file); 671 671 if (bsz1 == 0) {
+1 -12
usr.bin/sort/mem.c
··· 1 - /* $OpenBSD: mem.c,v 1.4 2015/04/01 20:58:13 millert Exp $ */ 1 + /* $OpenBSD: mem.c,v 1.5 2015/04/01 22:24:02 millert Exp $ */ 2 2 3 3 /*- 4 4 * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org> ··· 67 67 sort_free(void *ptr) 68 68 { 69 69 free(ptr); 70 - } 71 - 72 - /* 73 - * realloc() wrapper. 74 - */ 75 - void * 76 - sort_realloc(void *ptr, size_t size) 77 - { 78 - if ((ptr = realloc(ptr, size)) == NULL) 79 - err(2, NULL); 80 - return ptr; 81 70 } 82 71 83 72 /*
+1 -2
usr.bin/sort/mem.h
··· 1 - /* $OpenBSD: mem.h,v 1.3 2015/03/30 19:57:36 millert Exp $ */ 1 + /* $OpenBSD: mem.h,v 1.4 2015/04/01 22:24:02 millert Exp $ */ 2 2 3 3 /*- 4 4 * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org> ··· 41 41 void *sort_calloc(size_t nmemb, size_t size); 42 42 void *sort_malloc(size_t); 43 43 void sort_free(void *ptr); 44 - void *sort_realloc(void *, size_t); 45 44 void *sort_reallocarray(void *, size_t, size_t); 46 45 char *sort_strdup(const char *); 47 46 int sort_asprintf(char **, const char *, ...);
+2 -2
usr.bin/sort/sort.c
··· 1 - /* $OpenBSD: sort.c,v 1.66 2015/04/01 21:45:50 millert Exp $ */ 1 + /* $OpenBSD: sort.c,v 1.67 2015/04/01 22:24:02 millert Exp $ */ 2 2 3 3 /*- 4 4 * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org> ··· 1018 1018 1019 1019 if (keys_num == 0) { 1020 1020 keys_num = 1; 1021 - keys = sort_realloc(keys, sizeof(struct key_specs)); 1021 + keys = sort_reallocarray(keys, 1, sizeof(struct key_specs)); 1022 1022 memset(&(keys[0]), 0, sizeof(struct key_specs)); 1023 1023 keys[0].c1 = 1; 1024 1024 keys[0].pos1b = default_sort_mods->bflag;