summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-06-08 22:34:23 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-06-08 22:34:23 +0000
commit2d99c6da67a5d7f9cfa9e2bbbd7e5d59ea08a699 (patch)
treed856eb61bd8583a084c4c537cc305bee14ddd1fc
parent111a47815291330a4a46ee8cf7bd06a3a30ee74d (diff)
undo backport from stupids check: this is another broken api which should have had a uint instead of an int, but the docs do say "less than 1", so I guess we're providing the full negative range of an int in addition to zero instead of just zero
SVN revision: 71870
-rw-r--r--ChangeLog4
-rw-r--r--src/lib/eina_str.c3
2 files changed, 1 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index f4b2e0f..24ac4aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -55,7 +55,3 @@
552012-06-06 Mike Blumenkrantz 552012-06-06 Mike Blumenkrantz
56 56
57 * 1.0.2 release 57 * 1.0.2 release
58
592012-06-08 Mike Blumenkrantz
60
61 * Prevent negative max_token count for eina_str_split functions
diff --git a/src/lib/eina_str.c b/src/lib/eina_str.c
index 7f71d5e..9a62cb3 100644
--- a/src/lib/eina_str.c
+++ b/src/lib/eina_str.c
@@ -35,7 +35,7 @@
35 35
36#include "eina_private.h" 36#include "eina_private.h"
37#include "eina_str.h" 37#include "eina_str.h"
38#include "eina_safety_checks.h" 38
39/*============================================================================* 39/*============================================================================*
40* Local * 40* Local *
41*============================================================================*/ 41*============================================================================*/
@@ -75,7 +75,6 @@ eina_str_split_full_helper(const char *str,
75 size_t len, dlen; 75 size_t len, dlen;
76 unsigned int tokens; 76 unsigned int tokens;
77 77
78 EINA_SAFETY_ON_TRUE_RETURN_VAL(max_tokens < 0, NULL);
79 dlen = strlen(delim); 78 dlen = strlen(delim);
80 if (dlen == 0) 79 if (dlen == 0)
81 { 80 {