Revision 1eec614b qemu-char.c

b/qemu-char.c
193 193
    CharDriverState *chr;
194 194

  
195 195
    chr = qemu_mallocz(sizeof(CharDriverState));
196
    if (!chr)
197
        return NULL;
198 196
    chr->chr_write = null_chr_write;
199 197
    return chr;
200 198
}
......
425 423
    MuxDriver *d;
426 424

  
427 425
    chr = qemu_mallocz(sizeof(CharDriverState));
428
    if (!chr)
429
        return NULL;
430 426
    d = qemu_mallocz(sizeof(MuxDriver));
431
    if (!d) {
432
        free(chr);
433
        return NULL;
434
    }
435 427

  
436 428
    chr->opaque = d;
437 429
    d->drv = drv;
......
576 568
    FDCharDriver *s;
577 569

  
578 570
    chr = qemu_mallocz(sizeof(CharDriverState));
579
    if (!chr)
580
        return NULL;
581 571
    s = qemu_mallocz(sizeof(FDCharDriver));
582
    if (!s) {
583
        free(chr);
584
        return NULL;
585
    }
586 572
    s->fd_in = fd_in;
587 573
    s->fd_out = fd_out;
588 574
    chr->opaque = s;
......
929 915
#endif
930 916

  
931 917
    chr = qemu_mallocz(sizeof(CharDriverState));
932
    if (!chr)
933
        return NULL;
934 918
    s = qemu_mallocz(sizeof(PtyCharDriver));
935
    if (!s) {
936
        qemu_free(chr);
937
        return NULL;
938
    }
939 919

  
940 920
    if (openpty(&s->fd, &slave_fd, pty_name, NULL, NULL) < 0) {
941 921
        return NULL;
......
1246 1226
    }
1247 1227

  
1248 1228
    drv = qemu_mallocz(sizeof(ParallelCharDriver));
1249
    if (!drv) {
1250
        close(fd);
1251
        return NULL;
1252
    }
1253 1229
    drv->fd = fd;
1254 1230
    drv->mode = IEEE1284_MODE_COMPAT;
1255 1231

  
1256 1232
    chr = qemu_mallocz(sizeof(CharDriverState));
1257
    if (!chr) {
1258
	qemu_free(drv);
1259
        close(fd);
1260
        return NULL;
1261
    }
1262 1233
    chr->chr_write = null_chr_write;
1263 1234
    chr->chr_ioctl = pp_ioctl;
1264 1235
    chr->chr_close = pp_close;
......
1318 1289
        return NULL;
1319 1290

  
1320 1291
    chr = qemu_mallocz(sizeof(CharDriverState));
1321
    if (!chr) {
1322
        close(fd);
1323
        return NULL;
1324
    }
1325 1292
    chr->opaque = (void *)fd;
1326 1293
    chr->chr_write = null_chr_write;
1327 1294
    chr->chr_ioctl = pp_ioctl;
......
1535 1502
    WinCharState *s;
1536 1503

  
1537 1504
    chr = qemu_mallocz(sizeof(CharDriverState));
1538
    if (!chr)
1539
        return NULL;
1540 1505
    s = qemu_mallocz(sizeof(WinCharState));
1541
    if (!s) {
1542
        free(chr);
1543
        return NULL;
1544
    }
1545 1506
    chr->opaque = s;
1546 1507
    chr->chr_write = win_chr_write;
1547 1508
    chr->chr_close = win_chr_close;
......
1640 1601
    WinCharState *s;
1641 1602

  
1642 1603
    chr = qemu_mallocz(sizeof(CharDriverState));
1643
    if (!chr)
1644
        return NULL;
1645 1604
    s = qemu_mallocz(sizeof(WinCharState));
1646
    if (!s) {
1647
        free(chr);
1648
        return NULL;
1649
    }
1650 1605
    chr->opaque = s;
1651 1606
    chr->chr_write = win_chr_write;
1652 1607
    chr->chr_close = win_chr_close;
......
1666 1621
    WinCharState *s;
1667 1622

  
1668 1623
    chr = qemu_mallocz(sizeof(CharDriverState));
1669
    if (!chr)
1670
        return NULL;
1671 1624
    s = qemu_mallocz(sizeof(WinCharState));
1672
    if (!s) {
1673
        free(chr);
1674
        return NULL;
1675
    }
1676 1625
    s->hcom = fd_out;
1677 1626
    chr->opaque = s;
1678 1627
    chr->chr_write = win_chr_write;
......
1774 1723
    struct sockaddr_in saddr;
1775 1724

  
1776 1725
    chr = qemu_mallocz(sizeof(CharDriverState));
1777
    if (!chr)
1778
        goto return_err;
1779 1726
    s = qemu_mallocz(sizeof(NetCharDriver));
1780
    if (!s)
1781
        goto return_err;
1782 1727

  
1783 1728
    fd = socket(PF_INET, SOCK_DGRAM, 0);
1784 1729
    if (fd < 0) {
......
2044 1989
        is_waitconnect = 0;
2045 1990

  
2046 1991
    chr = qemu_mallocz(sizeof(CharDriverState));
2047
    if (!chr)
2048
        goto fail;
2049 1992
    s = qemu_mallocz(sizeof(TCPCharDriver));
2050
    if (!s)
2051
        goto fail;
2052 1993

  
2053 1994
    if (is_listen) {
2054 1995
        chr->filename = qemu_malloc(256);

Also available in: Unified diff