[Qemu-devel] [5087] Fix more bugs in r5044

[Blue Swirl]

Revision: 5087
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5087
Author:   blueswir1
Date:     2008-08-25 20:43:37 +0000 (Mon, 25 Aug 2008)

Log Message:
-----------
Fix more bugs in r5044

Modified Paths:
--------------
    trunk/audio/audio.c
    trunk/i386-dis.c

Modified: trunk/audio/audio.c
===================================================================
--- trunk/audio/audio.c 2008-08-25 20:03:28 UTC (rev 5086)
+++ trunk/audio/audio.c 2008-08-25 20:43:37 UTC (rev 5087)
@@ -205,7 +205,7 @@
     }
 
     len = strlen (s);
-    r = qemu_malloc (len + sizeof (qemu_prefix));
+    r = qemu_malloc (len + sizeof (qemu_prefix) + 1);
 
     if (r) {
         size_t i;

Modified: trunk/i386-dis.c
===================================================================
--- trunk/i386-dis.c    2008-08-25 20:03:28 UTC (rev 5086)
+++ trunk/i386-dis.c    2008-08-25 20:43:37 UTC (rev 5087)
@@ -2826,7 +2826,7 @@
 oappend (s)
      const char *s;
 {
-  pstrcpy (obufp, (size_t)(obufp - obuf), s);
+  pstrcpy (obufp, sizeof(obuf) - (size_t)(obufp - obuf), s);
   obufp += strlen (s);
 }