[libdrm][PATCH v2 1/2] random: Use unsigned long for seed
Jan Vesely
jan.vesely at rutgers.edu
Mon Feb 9 15:28:19 PST 2015
v2: Remove unrelated change in main()
This is more consistent with the rest, and avoids potential undefined
behavior (signed overflow) ind drmRandom()
Signed-off-by: Jan Vesely <jan.vesely at rutgers.edu>
---
xf86drmRandom.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/xf86drmRandom.c b/xf86drmRandom.c
index ecab9e2..94922ad 100644
--- a/xf86drmRandom.c
+++ b/xf86drmRandom.c
@@ -98,7 +98,7 @@ typedef struct RandomState {
unsigned long q; /* m div a */
unsigned long r; /* m mod a */
unsigned long check;
- long seed;
+ unsigned long seed;
} RandomState;
#if RANDOM_MAIN
@@ -147,13 +147,13 @@ int drmRandomDestroy(void *state)
unsigned long drmRandom(void *state)
{
RandomState *s = (RandomState *)state;
- long hi;
- long lo;
+ unsigned long hi;
+ unsigned long lo;
hi = s->seed / s->q;
lo = s->seed % s->q;
s->seed = s->a * lo - s->r * hi;
- if (s->seed <= 0) s->seed += s->m;
+ if ((s->a * lo) <= (s->r * hi)) s->seed += s->m;
return s->seed;
}
@@ -166,7 +166,7 @@ double drmRandomDouble(void *state)
}
#if RANDOM_MAIN
-static void check_period(long seed)
+static void check_period(unsigned long seed)
{
unsigned long count = 0;
unsigned long initial;
@@ -178,7 +178,7 @@ static void check_period(long seed)
while (initial != drmRandom(state)) {
if (!++count) break;
}
- printf("With seed of %10ld, period = %10lu (0x%08lx)\n",
+ printf("With seed of %10lu, period = %10lu (0x%08lx)\n",
seed, count, count);
drmRandomDestroy(state);
}
--
2.1.0
More information about the dri-devel
mailing list