From: Dana Jansens Date: Wed, 28 Apr 2010 14:59:42 +0000 (-0400) Subject: found memory corruption in the obt xqueue and paths X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=5e424b81d24d82f7584ea175cd6579baba3695d7;p=chaz%2Fopenbox found memory corruption in the obt xqueue and paths --- diff --git a/obt/paths.c b/obt/paths.c index 8afe4f71..b20eb48d 100644 --- a/obt/paths.c +++ b/obt/paths.c @@ -126,7 +126,7 @@ static void find_uid_gid(uid_t *u, gid_t **g, guint *n) } endgrent(); - qsort(*g, sizeof(gid_t), *n, gid_cmp); + qsort(*g, *n, sizeof(gid_t), gid_cmp); } ObtPaths* obt_paths_new(void) diff --git a/obt/xqueue.c b/obt/xqueue.c index 2304ea42..e5d2da31 100644 --- a/obt/xqueue.c +++ b/obt/xqueue.c @@ -78,8 +78,8 @@ static inline void grow(void) { if (qend < qstart) { /* it wraps around to 0 right now */ for (i = 0; i <= qend; ++i) - q[newsz+i] = q[i]; - qend = newsz + qend; + q[qsz+i] = q[i]; + qend = qsz + qend; } qsz = newsz; @@ -113,7 +113,7 @@ static gboolean read_events(gboolean block) return sth; /* return if we read anything */ } -static void pop(gulong p) +static void pop(const gulong p) { /* remove the event */ --qnum;