d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dont alloc size 0 buffers.

Browse Source
This commit is contained in:
Søren Schmidt 2004-02-21 18:30:03 +00:00
parent 73f8099662
commit 056b9907de
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/ata/atapi-cd.c
View File

@ -1590,7 +1590,7 @@ acd_send_cue(struct acd_softc *cdp, struct cdr_cuesheet *cuesheet)
static int static int
acd_report_key(struct acd_softc *cdp, struct dvd_authinfo *ai) 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; u_int32_t lba = 0;
int16_t length; int16_t length;
int8_t ccb[16]; int8_t ccb[16];
@ -1629,8 +1629,10 @@ acd_report_key(struct acd_softc *cdp, struct dvd_authinfo *ai)
ccb[9] = length & 0xff; ccb[9] = length & 0xff;
ccb[10] = (ai->agid << 6) | ai->format; ccb[10] = (ai->agid << 6) | ai->format;
d = malloc(length, M_ACD, M_NOWAIT | M_ZERO); if (length) {
d->length = htons(length - 2); d = malloc(length, M_ACD, M_NOWAIT | M_ZERO);
d->length = htons(length - 2);
}
error = ata_atapicmd(cdp->device, ccb, (caddr_t)d, length, error = ata_atapicmd(cdp->device, ccb, (caddr_t)d, length,
ai->format == DVD_INVALIDATE_AGID ? 0 : ATA_R_READ,10); ai->format == DVD_INVALIDATE_AGID ? 0 : ATA_R_READ,10);