libbluray | branch: master | Rafaël Carré <[email protected]> | Fri Dec 30 17:45:23 2011 +0200| [9652ffcafe5e4705438f3996d87a92c1799be0e5] | committer: hpi1
don't use calloc() if device_path is NULL > http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=9652ffcafe5e4705438f3996d87a92c1799be0e5 --- src/libbluray/bluray.c | 30 ++++++++++++++---------------- 1 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/libbluray/bluray.c b/src/libbluray/bluray.c index 0954544..05a08f3 100644 --- a/src/libbluray/bluray.c +++ b/src/libbluray/bluray.c @@ -913,33 +913,31 @@ static void _fill_disc_info(BLURAY *bd) BLURAY *bd_open(const char* device_path, const char* keyfile_path) { + if (!device_path) { + BD_DEBUG(DBG_BLURAY | DBG_CRIT, "No device path provided!\n"); + return NULL; + } + BLURAY *bd = calloc(1, sizeof(BLURAY)); BD_DEBUG(DBG_BLURAY, "libbluray version "BLURAY_VERSION_STRING"\n"); - if (device_path) { - - bd->device_path = (char*)malloc(strlen(device_path) + 1); - strcpy(bd->device_path, device_path); + bd->device_path = (char*)malloc(strlen(device_path) + 1); + strcpy(bd->device_path, device_path); - _libaacs_open(bd, keyfile_path); + _libaacs_open(bd, keyfile_path); - _libbdplus_open(bd, keyfile_path); + _libbdplus_open(bd, keyfile_path); - _index_open(bd); + _index_open(bd); - bd->meta = NULL; + bd->meta = NULL; - bd->regs = bd_registers_init(); + bd->regs = bd_registers_init(); - _fill_disc_info(bd); + _fill_disc_info(bd); - BD_DEBUG(DBG_BLURAY, "BLURAY initialized! (%p)\n", bd); - } else { - X_FREE(bd); - - BD_DEBUG(DBG_BLURAY | DBG_CRIT, "No device path provided!\n"); - } + BD_DEBUG(DBG_BLURAY, "BLURAY initialized! (%p)\n", bd); return bd; } _______________________________________________ libbluray-devel mailing list [email protected] http://mailman.videolan.org/listinfo/libbluray-devel
