return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
} else {
char *p = NULL;
+ int error = 0;
char s[value_to_match->length+1];
+
memcpy(s, value_to_match->data, value_to_match->length);
s[value_to_match->length] = 0;
if (s[0] == '\0' || s[0] == '-') {
DBG_ERR("Empty timestamp passed\n");
return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
}
- tombstone_time = strtoull(s, &p, 10);
- if (p == NULL || p == s || *p != '\0' ||
- tombstone_time == ULLONG_MAX) {
+ tombstone_time = strtoull_err(s, &p, 10, &error);
+ if (p == NULL ||
+ p == s ||
+ *p != '\0' ||
+ error != 0 ||
+ tombstone_time == ULLONG_MAX)
+ {
DBG_ERR("Invalid timestamp string passed\n");
return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
}
return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
} else {
char *p = NULL;
+ int error = 0;
char s[value_to_match->length+1];
+
memcpy(s, value_to_match->data, value_to_match->length);
s[value_to_match->length] = 0;
if (s[0] == '\0' || s[0] == '-') {
return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
}
- tombstone_time = strtoull(s, &p, 10);
- if (p == NULL || p == s || *p != '\0' || tombstone_time == ULLONG_MAX) {
+ tombstone_time = strtoull_err(s, &p, 10, &error);
+ if (p == NULL ||
+ p == s ||
+ *p != '\0' ||
+ error != 0 ||
+ tombstone_time == ULLONG_MAX)
+ {
return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
}
}
line = string;
while (line && line[0]) {
+ int error = 0;
+
p=strchr(line, ';');
if (p) {
p[0] = '\0';
return -1;
}
- blob->ctr.dsdb.mappings[blob->ctr.dsdb.num_mappings].id_prefix = strtoul(line, &oid, 10);
+ blob->ctr.dsdb.mappings[blob->ctr.dsdb.num_mappings].id_prefix =
+ strtoul_err(line, &oid, 10, &error);
- if (oid[0] != ':') {
+ if (oid[0] != ':' || error != 0) {
talloc_free(tmp_ctx);
return -1;
}
*/
unsigned long lp_ulong(const char *s)
{
+ int error = 0;
+ unsigned long int ret;
if (!s || !*s) {
- DEBUG(0,("lp_ulong(%s): is called with NULL!\n",s));
+ DBG_DEBUG("lp_ulong(%s): is called with NULL!\n",s);
return -1;
}
- return strtoul(s, NULL, 0);
+ ret = strtoul_err(s, NULL, 0, &error);
+ if (error != 0) {
+ DBG_DEBUG("lp_ulong(%s): conversion failed\n",s);
+ return -1;
+ }
+
+ return ret;
}
/**
*/
unsigned long long lp_ulonglong(const char *s)
{
+ int error = 0;
+ unsigned long long int ret;
if (!s || !*s) {
- DEBUG(0, ("lp_ulonglong(%s): is called with NULL!\n", s));
+ DBG_DEBUG("lp_ulonglong(%s): is called with NULL!\n", s);
return -1;
}
- return strtoull(s, NULL, 0);
+ ret = strtoull_err(s, NULL, 0, &error);
+ if (error != 0) {
+ DBG_DEBUG("lp_ulonglong(%s): conversion failed\n",s);
+ return -1;
+ }
+
+ return ret;
}
/**
}
} else {
char *endp = NULL;
- unsigned long val = strtoul(slash+1, &endp, 0);
- if (slash+1 == endp || (endp && *endp != '\0')) {
+ int error = 0;
+ unsigned long val;
+
+ val = strtoul_err(slash+1, &endp, 0, &error);
+ if (slash+1 == endp || (endp && *endp != '\0') || error != 0) {
return false;
}
if (!make_netmask(&ss_mask, &ss_tok, val)) {
const char *p = (const char *)OID;
char *newp;
int i;
+ int error = 0;
if (!isdigit(*p)) return false;
- v = strtoul(p, &newp, 10);
- if (newp[0] != '.') return false;
+ v = strtoul_err(p, &newp, 10, &error);
+ if (newp[0] != '.' || error != 0) {
+ return false;
+ }
p = newp + 1;
if (!isdigit(*p)) return false;
- v2 = strtoul(p, &newp, 10);
- if (newp[0] != '.') return false;
+ v2 = strtoul_err(p, &newp, 10, &error);
+ if (newp[0] != '.' || error != 0) {
+ return false;
+ }
p = newp + 1;
/*the ber representation can't use more space than the string one */
i = 1;
while (*p) {
if (!isdigit(*p)) return false;
- v = strtoul(p, &newp, 10);
- if (newp[0] == '.') {
+ v = strtoul_err(p, &newp, 10, &error);
+ if (newp[0] == '.' || error != 0) {
p = newp + 1;
/* check for empty last component */
if (!*p) return false;
{
char * end = NULL;
unsigned long long lval;
+ int error = 0;
if (str == NULL || *str == '\0') {
return false;
}
- lval = strtoull(str, &end, 10 /* base */);
- if (end == NULL || end == str) {
+ lval = strtoull_err(str, &end, 10, &error);
+ if (end == NULL || end == str || error != 0) {
return false;
}
{
char * end = NULL;
unsigned long long lval;
+ int error = 0;
if (str == NULL || *str == '\0') {
return false;
}
- lval = strtoull(str, &end, 10 /* base */);
- if (end == NULL || *end != '\0' || end == str) {
+ lval = strtoull_err(str, &end, 10, &error);
+ if (end == NULL || *end != '\0' || end == str || error != 0) {
return false;
}