Merge commit 'elmarco/master'

This commit is contained in:
Lennart Poettering 2009-01-14 00:22:27 +01:00
commit f3101133d7
9 changed files with 163 additions and 6 deletions

View file

@ -359,7 +359,7 @@ pa_proplist *pa_proplist_from_string(const char *str) {
}
blob = pa_xmalloc((size_t)(e-v)/2);
if (pa_parsehex(v, blob, (e-v)/2) != ((e-v)/2)) {
if (pa_parsehex(v, blob, (e-v)/2) != (size_t)((e-v)/2)) {
pa_log("Invalid \"hex:\" value data");
pa_xfree(blob);
break;