mailing list of musl libc
 help / color / mirror / code / Atom feed
8a17c48dacfd9abd078bca09ea67ba2e227e1fb6 blob 2752 bytes (raw)

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
 
#include <string.h>
#include <wchar.h>
#include "atomic.h"

void *__memcpy_chk(void *restrict dest, const void *restrict src, size_t n, size_t destlen)
{
	if (n > destlen) a_crash();
	return memcpy(dest, src, n);
}

void *__memmove_chk(void *restrict dest, const void *restrict src, size_t n, size_t destlen)
{
	if (n > destlen) a_crash();
	return memmove(dest, src, n);
}

void *__memset_chk(void *dest, int c, size_t n, size_t destlen)
{
	if (n > destlen) a_crash();
	return memset(dest, c, n);
}

char *__strcat_chk(char *restrict dest, const char *restrict src, size_t destlen)
{
	size_t tot;
	tot = strnlen(src, destlen);
	if (tot > SIZE_MAX - strnlen(dest, destlen) - 1) a_crash();
	tot += strnlen(dest, destlen) + 1;
	if (tot > destlen) a_crash();
	return strcat(dest, src);
}

char *__strncat_chk(char *restrict dest, const char *restrict src, size_t n, size_t destlen)
{
	size_t tot;
	tot = strnlen(dest, destlen);
	if (tot > SIZE_MAX - strnlen(src, n) - 1) a_crash();
	tot += strnlen(src, n) + 1;
	if (tot > destlen) a_crash();
	return strncat(dest, src, n);
}

char *__strcpy_chk(char *restrict dest, const char *restrict src, size_t destlen)
{
	if ( strlen(src) >= destlen) a_crash();
	return strcpy(dest, src);
}

char *__strncpy_chk(char *restrict dest, const char *restrict src, size_t n, size_t destlen)
{
	if (n > destlen) a_crash();
	return strncpy(dest, src, n);
}

wchar_t *__wcscat_chk(wchar_t *restrict dest, const wchar_t *src, size_t destlen)
{
	size_t tot;
	tot = wcsnlen(src, destlen);
	if (tot > SIZE_MAX - wcsnlen(dest, destlen) - 1) a_crash();
	tot += wcsnlen(dest, destlen) + 1;
	if (tot > destlen) a_crash();
	return wcscat(dest, src);
}

wchar_t *__wcscpy_chk(wchar_t *restrict dest, const wchar_t *restrict src, size_t destlen)
{
	size_t srclen = wcsnlen(src, destlen) + 1;
	if (srclen > destlen) a_crash();
	return wcscpy(dest, src);
}

wchar_t *__wcsncat_chk(wchar_t *restrict dest, const wchar_t *restrict src, size_t n, size_t destlen)
{
	size_t tot;
	tot = wcsnlen(dest, destlen);
	if (tot > SIZE_MAX - wcsnlen(src, n) - 1) a_crash();
	tot += wcsnlen(dest, destlen) + 1;
	if (tot > destlen) a_crash();
	return wcsncat(dest, src, n);
}

wchar_t *__wcsncpy_chk(wchar_t *restrict dest, const wchar_t *restrict src, size_t n, size_t destlen)
{
	if (n > destlen) a_crash();
	return wcsncpy(dest, src, n);
}

wchar_t *__wmemcpy_chk(wchar_t *restrict d, const wchar_t *restrict s, size_t n, size_t dlen)
{
	if (n > dlen) a_crash();
	return wmemcpy(d, s, n);
}

wchar_t *__wmemmove_chk(wchar_t *d, const wchar_t *s, size_t n, size_t dlen)
{
	if (n > dlen) a_crash();
	return wmemmove(d, s, n);
}

wchar_t *__wmemset_chk(wchar_t *d, wchar_t c, size_t n, size_t dlen)
{
	if (n > dlen) a_crash();
	return wmemset(d, c, n);
}
debug log:

solving 8a17c48 ...
found 8a17c48 in https://inbox.vuxu.org/musl/20150831011011.GA2232@newbook/ ||
	https://inbox.vuxu.org/musl/20150701142106.GA1829@newbook/
found ba77c9c in https://inbox.vuxu.org/musl/1434509291-28997-1-git-send-email-josiahw@gmail.com/

applying [1/3] https://inbox.vuxu.org/musl/1434509291-28997-1-git-send-email-josiahw@gmail.com/
diff --git a/src/compat/string_chk.c b/src/compat/string_chk.c
new file mode 100644
index 0000000..ba77c9c


applying [2/3] https://inbox.vuxu.org/musl/20150831011011.GA2232@newbook/
diff --git a/src/compat/string_chk.c b/src/compat/string_chk.c
index ba77c9c..8a17c48 100644

Checking patch src/compat/string_chk.c...
Applied patch src/compat/string_chk.c cleanly.
Checking patch src/compat/string_chk.c...
Applied patch src/compat/string_chk.c cleanly.

skipping https://inbox.vuxu.org/musl/20150701142106.GA1829@newbook/ for 8a17c48
index at:
100644 8a17c48dacfd9abd078bca09ea67ba2e227e1fb6	src/compat/string_chk.c

Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/musl/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).