Fix more bugs in r5044

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5087 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/audio/audio.c b/audio/audio.c
index 20bb2fc264cd20d77cc2f16c7377b2e0b0b85f5a..5e2d4cfb0fcaf230c3aae60cd2ca56d53aa33cc0 100644 (file)
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -205,7 +205,7 @@ static char *audio_alloc_prefix (const char *s)
     }
 
     len = strlen (s);
-    r = qemu_malloc (len + sizeof (qemu_prefix));
+    r = qemu_malloc (len + sizeof (qemu_prefix) + 1);
 
     if (r) {
         size_t i;

diff --git a/i386-dis.c b/i386-dis.c
index 0c97e1c7d17ab8b770b35955e2341447a3ae5a30..5f69acaf3936710a152a15105adf48ce87f28a1c 100644 (file)
--- a/i386-dis.c
+++ b/i386-dis.c
@@ -2826,7 +2826,7 @@ static void
 oappend (s)
      const char *s;
 {
-  pstrcpy (obufp, (size_t)(obufp - obuf), s);
+  pstrcpy (obufp, sizeof(obuf) - (size_t)(obufp - obuf), s);
   obufp += strlen (s);
 }