From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59256) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T6oJc-0005s3-VP for qemu-devel@nongnu.org; Wed, 29 Aug 2012 15:52:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T6oJb-0004O3-Uo for qemu-devel@nongnu.org; Wed, 29 Aug 2012 15:52:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45271) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T6oJb-0004Ns-MI for qemu-devel@nongnu.org; Wed, 29 Aug 2012 15:52:39 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q7TJqcJ4002769 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 29 Aug 2012 15:52:38 -0400 From: Luiz Capitulino Date: Wed, 29 Aug 2012 16:53:05 -0300 Message-Id: <1346269986-13539-9-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1346269986-13539-1-git-send-email-lcapitulino@redhat.com> References: <1346269986-13539-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 8/9] tcx: tcx24_screen_dump(): add error handling List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: alevy@redhat.com Signed-off-by: Luiz Capitulino --- hw/tcx.c | 50 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 9 deletions(-) diff --git a/hw/tcx.c b/hw/tcx.c index 74a7085..428649e 100644 --- a/hw/tcx.c +++ b/hw/tcx.c @@ -611,12 +611,18 @@ static void tcx24_screen_dump(void *opaque, const char *filename, bool cswitch, FILE *f; uint8_t *d, *d1, v; uint32_t *s24, *cptr, dval; - int y, x; + int ret, y, x; f = fopen(filename, "wb"); - if (!f) + if (!f) { + error_setg(errp, "failed to open file '%s': %s", filename, + strerror(errno)); return; - fprintf(f, "P6\n%d %d\n%d\n", s->width, s->height, 255); + } + ret = fprintf(f, "P6\n%d %d\n%d\n", s->width, s->height, 255); + if (ret < 0) { + goto write_err; + } d1 = s->vram; s24 = s->vram24; cptr = s->cplane; @@ -625,20 +631,46 @@ static void tcx24_screen_dump(void *opaque, const char *filename, bool cswitch, for(x = 0; x < s->width; x++, d++, s24++) { if ((*cptr++ & 0xff000000) == 0x03000000) { // 24-bit direct dval = *s24 & 0x00ffffff; - fputc((dval >> 16) & 0xff, f); - fputc((dval >> 8) & 0xff, f); - fputc(dval & 0xff, f); + ret = fputc((dval >> 16) & 0xff, f); + if (ret == EOF) { + goto write_err; + } + ret = fputc((dval >> 8) & 0xff, f); + if (ret == EOF) { + goto write_err; + } + ret = fputc(dval & 0xff, f); + if (ret == EOF) { + goto write_err; + } } else { v = *d; - fputc(s->r[v], f); - fputc(s->g[v], f); - fputc(s->b[v], f); + ret = fputc(s->r[v], f); + if (ret == EOF) { + goto write_err; + } + ret = fputc(s->g[v], f); + if (ret == EOF) { + goto write_err; + } + ret = fputc(s->b[v], f); + if (ret == EOF) { + goto write_err; + } } } d1 += MAXX; } + +out: fclose(f); return; + +write_err: + error_setg(errp, "failed to write to file '%s': %s", filename, + strerror(errno)); + unlink(filename); + goto out; } static Property tcx_properties[] = { -- 1.7.11.2.249.g31c7954.dirty