56 lines
1.9 KiB
Diff
56 lines
1.9 KiB
Diff
|
From 8ac12aa2c80b1a5eec8fdafa66611c8c7cde5af7 Mon Sep 17 00:00:00 2001
|
||
|
|
From: ph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>
|
||
|
|
Date: Fri, 14 Apr 2017 12:14:41 +0000
|
||
|
|
Subject: [PATCH] Correct an incorrect cast.
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@748 6239d852-aaf2-0410-a92c-79f79f948069
|
||
|
|
|
||
|
|
Petr Písař: Ported to 10.23.
|
||
|
|
---
|
||
|
|
src/pcre2_valid_utf.c | 8 ++++----
|
||
|
|
2 files changed, 6 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/pcre2_valid_utf.c b/src/pcre2_valid_utf.c
|
||
|
|
index 3e18f12..96e8bff 100644
|
||
|
|
--- a/src/pcre2_valid_utf.c
|
||
|
|
+++ b/src/pcre2_valid_utf.c
|
||
|
|
@@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language.
|
||
|
|
|
||
|
|
Written by Philip Hazel
|
||
|
|
Original API code Copyright (c) 1997-2012 University of Cambridge
|
||
|
|
- New API code Copyright (c) 2016 University of Cambridge
|
||
|
|
+ New API code Copyright (c) 2016-2017 University of Cambridge
|
||
|
|
|
||
|
|
-----------------------------------------------------------------------------
|
||
|
|
Redistribution and use in source and binary forms, with or without
|
||
|
|
@@ -142,20 +142,20 @@ for (p = string; length > 0; p++)
|
||
|
|
|
||
|
|
if (c < 0xc0) /* Isolated 10xx xxxx byte */
|
||
|
|
{
|
||
|
|
- *erroroffset = (int)(p - string);
|
||
|
|
+ *erroroffset = (PCRE2_SIZE)(p - string);
|
||
|
|
return PCRE2_ERROR_UTF8_ERR20;
|
||
|
|
}
|
||
|
|
|
||
|
|
if (c >= 0xfe) /* Invalid 0xfe or 0xff bytes */
|
||
|
|
{
|
||
|
|
- *erroroffset = (int)(p - string);
|
||
|
|
+ *erroroffset = (PCRE2_SIZE)(p - string);
|
||
|
|
return PCRE2_ERROR_UTF8_ERR21;
|
||
|
|
}
|
||
|
|
|
||
|
|
ab = PRIV(utf8_table4)[c & 0x3f]; /* Number of additional bytes (1-5) */
|
||
|
|
if (length < ab) /* Missing bytes */
|
||
|
|
{
|
||
|
|
- *erroroffset = (int)(p - string);
|
||
|
|
+ *erroroffset = (PCRE2_SIZE)(p - string);
|
||
|
|
switch(ab - length)
|
||
|
|
{
|
||
|
|
case 1: return PCRE2_ERROR_UTF8_ERR1;
|
||
|
|
--
|
||
|
|
2.7.4
|
||
|
|
|