projects
/
dana
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
55b8431
)
found memory corruption in the obt xqueue and paths
author
Dana Jansens
<danakj@orodu.net>
Wed, 28 Apr 2010 14:59:42 +0000
(10:59 -0400)
committer
Dana Jansens
<danakj@orodu.net>
Wed, 28 Apr 2010 16:58:45 +0000
(12:58 -0400)
obt/paths.c
patch
|
blob
|
history
obt/xqueue.c
patch
|
blob
|
history
diff --git
a/obt/paths.c
b/obt/paths.c
index
8afe4f7
..
b20eb48
100644
(file)
--- 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
2304ea4
..
e5d2da3
100644
(file)
--- 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[
new
sz+i] = q[i];
- qend =
new
sz + qend;
+ q[
q
sz+i] = q[i];
+ qend =
q
sz + 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;