From d7d3f533178bc644879ef9a28a111b0ef49fd4e4 Mon Sep 17 00:00:00 2001 From: reimar Date: Thu, 9 Mar 2006 17:39:34 +0000 Subject: fix another sizeof(dvd_input_t) bug (must be struct dvd_input_s instead) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17787 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdvdkit2/dvd_input.c | 2 +- libmpdvdkit2/libdvdread_changes.diff | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'libmpdvdkit2') diff --git a/libmpdvdkit2/dvd_input.c b/libmpdvdkit2/dvd_input.c index 840d8e2086..16ad060efa 100644 --- a/libmpdvdkit2/dvd_input.c +++ b/libmpdvdkit2/dvd_input.c @@ -158,7 +158,7 @@ static dvd_input_t file_open(const char *target) dvd_input_t dev; /* Allocate the library structure */ - dev = (dvd_input_t) malloc(sizeof(dvd_input_t)); + dev = (dvd_input_t) malloc(sizeof(struct dvd_input_s)); if(dev == NULL) { fprintf(stderr, "libdvdread: Could not allocate memory.\n"); return NULL; diff --git a/libmpdvdkit2/libdvdread_changes.diff b/libmpdvdkit2/libdvdread_changes.diff index 206f767be6..e343a217db 100644 --- a/libmpdvdkit2/libdvdread_changes.diff +++ b/libmpdvdkit2/libdvdread_changes.diff @@ -87,6 +87,15 @@ diff -Naur dvdread.orig/dvd_input.c dvdread/dvd_input.c /* Allocate the handle structure */ - dev = (dvd_input_t) malloc(sizeof(dvd_input_t)); ++ dev = (dvd_input_t) malloc(sizeof(struct dvd_input_s)); + if(dev == NULL) { + fprintf(stderr, "libdvdread: Could not allocate memory.\n"); + return NULL; +@@ -158,7 +158,7 @@ + dvd_input_t dev; + + /* Allocate the library structure */ +- dev = (dvd_input_t) malloc(sizeof(dvd_input_t)); + dev = (dvd_input_t) malloc(sizeof(struct dvd_input_s)); if(dev == NULL) { fprintf(stderr, "libdvdread: Could not allocate memory.\n"); -- cgit v1.2.3