diff options
| author | dim <dim@FreeBSD.org> | 2015-05-27 20:26:41 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-05-27 20:26:41 +0000 |
| commit | 5ef8fd3549d38e883a31881636be3dc2a275de20 (patch) | |
| tree | bd13a22d9db57ccf3eddbc07b32c18109521d050 /contrib/llvm/lib/Support/regcomp.c | |
| parent | 77794ebe2d5718eb502c93ec32f8ccae4d8a0b7b (diff) | |
| parent | 782067d0278612ee75d024b9b135c221c327e9e8 (diff) | |
| download | FreeBSD-src-5ef8fd3549d38e883a31881636be3dc2a275de20.zip FreeBSD-src-5ef8fd3549d38e883a31881636be3dc2a275de20.tar.gz | |
Merge llvm trunk r238337 from ^/vendor/llvm/dist, resolve conflicts, and
preserve our customizations, where necessary.
Diffstat (limited to 'contrib/llvm/lib/Support/regcomp.c')
| -rw-r--r-- | contrib/llvm/lib/Support/regcomp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/llvm/lib/Support/regcomp.c b/contrib/llvm/lib/Support/regcomp.c index b796929..ebde64f 100644 --- a/contrib/llvm/lib/Support/regcomp.c +++ b/contrib/llvm/lib/Support/regcomp.c @@ -1422,7 +1422,7 @@ enlarge(struct parse *p, sopno size) if (p->ssize >= size) return; - if ((unsigned long)size > SIZE_MAX / sizeof(sop)) { + if ((uintptr_t)size > SIZE_MAX / sizeof(sop)) { SETERROR(REG_ESPACE); return; } @@ -1443,7 +1443,7 @@ static void stripsnug(struct parse *p, struct re_guts *g) { g->nstates = p->slen; - if ((unsigned long)p->slen > SIZE_MAX / sizeof(sop)) { + if ((uintptr_t)p->slen > SIZE_MAX / sizeof(sop)) { g->strip = p->strip; SETERROR(REG_ESPACE); return; |
