summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-10-19 22:47:45 +1100
committerAndrew Tridgell <tridge@samba.org>2009-10-19 22:47:45 +1100
commitd680729dfb09ebff844fb13a354cba1c0be22578 (patch)
tree03cf0a05ba1675fa80e133e76f08ab03effd7bcd /lib
parent729c4b3eeef132ea29d1145d276b63744acfa023 (diff)
downloadsamba-d680729dfb09ebff844fb13a354cba1c0be22578.tar.gz
samba-d680729dfb09ebff844fb13a354cba1c0be22578.tar.bz2
samba-d680729dfb09ebff844fb13a354cba1c0be22578.zip
util: fixed generate_unique_strs() to be portable
'place' was going negative, and giving undefined results. The result was duplicate names which gave errors in SMB2-DIR on PPC and other systems.
Diffstat (limited to 'lib')
-rw-r--r--lib/util/genrand.c44
1 files changed, 13 insertions, 31 deletions
diff --git a/lib/util/genrand.c b/lib/util/genrand.c
index 8c7d88a112..6002c0647e 100644
--- a/lib/util/genrand.c
+++ b/lib/util/genrand.c
@@ -362,24 +362,6 @@ again:
}
/**
- * Define our own pow() function to avoid linking in libm
- */
-static double s_pow(double x, double y)
-{
- int i;
- double ret = x;
-
- if (y == 0)
- return 1;
-
- for (i = 1; i < y; i++)
- ret *= x;
-
- return ret;
-}
-
-
-/**
* Generate an array of unique text strings all of the same length.
* The returned string will be allocated.
* Returns NULL if the number of unique combinations cannot be created.
@@ -390,30 +372,30 @@ _PUBLIC_ char** generate_unique_strs(TALLOC_CTX *mem_ctx, size_t len,
uint32_t num)
{
const char *c_list = "abcdefghijklmnopqrstuvwxyz0123456789+_-#.,";
- const int c_size = 42;
- int i, j, rem;
+ const unsigned c_size = 42;
+ int i, j;
+ unsigned rem;
long long place;
char ** strs = NULL;
if (num == 0 || len == 0)
return NULL;
- /* We'll never return more than UINT32_MAX strings. Since 42^6 is more
- * than UINT32_MAX, we only have to check if we've been asked to return
- * more than the total number of permutations for lengths less than 6.*/
- if ((len < 6) && (num > s_pow(c_size, len)))
- return NULL;
-
strs = talloc_array(mem_ctx, char *, num);
+ if (strs == NULL) return NULL;
for (i = 0; i < num; i++) {
- char *retstr = (char *)talloc_zero_size(mem_ctx, len + 1);
+ char *retstr = (char *)talloc_size(strs, len + 1);
+ if (retstr == NULL) {
+ talloc_free(strs);
+ return NULL;
+ }
rem = i;
- for (j = len - 1; j >= 0; j--) {
- place = s_pow(c_size, j);
- retstr[j] = c_list[rem / place];
- rem = rem % place;
+ for (j = 0; j < len; j++) {
+ retstr[j] = c_list[rem % c_size];
+ rem = rem / c_size;
}
+ retstr[j] = 0;
strs[i] = retstr;
}