diff options
| author | sos <sos@FreeBSD.org> | 2004-02-21 18:30:03 +0000 |
|---|---|---|
| committer | sos <sos@FreeBSD.org> | 2004-02-21 18:30:03 +0000 |
| commit | 1de14db959857cfbf8809a7a86fe7d5ff189dbc8 (patch) | |
| tree | 6a8767cccd4f5b5b8bffec9f1c0c1bb6cc06505e /sys/dev | |
| parent | 7a8fa65984697a768d10c27781d9ef294168efda (diff) | |
| download | FreeBSD-src-1de14db959857cfbf8809a7a86fe7d5ff189dbc8.zip FreeBSD-src-1de14db959857cfbf8809a7a86fe7d5ff189dbc8.tar.gz | |
Dont alloc size 0 buffers.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ata/atapi-cd.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c index 3886564..38309b3 100644 --- a/sys/dev/ata/atapi-cd.c +++ b/sys/dev/ata/atapi-cd.c @@ -1590,7 +1590,7 @@ acd_send_cue(struct acd_softc *cdp, struct cdr_cuesheet *cuesheet) static int acd_report_key(struct acd_softc *cdp, struct dvd_authinfo *ai) { - struct dvd_miscauth *d; + struct dvd_miscauth *d = NULL; u_int32_t lba = 0; int16_t length; int8_t ccb[16]; @@ -1629,8 +1629,10 @@ acd_report_key(struct acd_softc *cdp, struct dvd_authinfo *ai) ccb[9] = length & 0xff; ccb[10] = (ai->agid << 6) | ai->format; - d = malloc(length, M_ACD, M_NOWAIT | M_ZERO); - d->length = htons(length - 2); + if (length) { + d = malloc(length, M_ACD, M_NOWAIT | M_ZERO); + d->length = htons(length - 2); + } error = ata_atapicmd(cdp->device, ccb, (caddr_t)d, length, ai->format == DVD_INVALIDATE_AGID ? 0 : ATA_R_READ,10); |
