com php-src: add ovfl check, fix warnings: ext/dom/text.c
| From: | Anatol Belski | Date: | Thu, 24 Sep 2015 14:33:56 +0000 |
| Subject: | com php-src: add ovfl check, fix warnings: ext/dom/text.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89163@lists.php.net to get a copy of this message | ||
Commit: a7552ca31097b0be405dc324be11c77109e09a4e
Author: Anatol Belski <ab@php.net> Thu, 24 Sep 2015 07:18:31 +0200
Parents: 807c29ed141bc6d7d9790e86c00186e01300d006
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a7552ca31097b0be405dc324be11c77109e09a4e
Log:
add ovfl check, fix warnings
Changed paths:
M ext/dom/text.c
Diff:
diff --git a/ext/dom/text.c b/ext/dom/text.c
index bdd6e38..8321672 100644
--- a/ext/dom/text.c
+++ b/ext/dom/text.c
@@ -164,13 +164,13 @@ PHP_FUNCTION(dom_text_split_text)
}
length = xmlUTF8Strlen(cur);
- if (offset > length || offset < 0) {
+ if (ZEND_LONG_INT_OVFL(offset) || (int)offset > length || offset < 0) {
xmlFree(cur);
RETURN_FALSE;
}
- first = xmlUTF8Strndup(cur, offset);
- second = xmlUTF8Strsub(cur, offset, length - offset);
+ first = xmlUTF8Strndup(cur, (int)offset);
+ second = xmlUTF8Strsub(cur, (int)offset, (int)(length - offset));
xmlFree(cur);