summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-06-08 13:52:10 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-06-08 13:52:10 +0000
commit632547e9324e5dffbb5e3dec320a15de61b29dd0 (patch)
treef77f6d5ae3cd9052328792dafd3703458f929604
parentfea656461f019ca6e0f2372618f5c383f7ec4c4c (diff)
backports for previous commit
SVN revision: 71852
-rw-r--r--ChangeLog4
-rw-r--r--src/lib/eina_str.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 24ac4aa..f4b2e0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -55,3 +55,7 @@
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 9a62cb3..52a7a37 100644
--- a/src/lib/eina_str.c
+++ b/src/lib/eina_str.c
@@ -75,6 +75,7 @@ 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 < 1, NULL);
78 dlen = strlen(delim); 79 dlen = strlen(delim);
79 if (dlen == 0) 80 if (dlen == 0)
80 { 81 {