From d0d053a9f9fc3cc65704c5abd8a2a3c92b3f33ae Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 4 Sep 2013 02:04:31 -0500 Subject: [PATCH] Fix for old libc version on bionic. Old versions would crash if the second argument was NULL. --- Source/Core/Common/Src/CDUtils.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Source/Core/Common/Src/CDUtils.cpp b/Source/Core/Common/Src/CDUtils.cpp index 9a302b9189..f697476df5 100644 --- a/Source/Core/Common/Src/CDUtils.cpp +++ b/Source/Core/Common/Src/CDUtils.cpp @@ -214,7 +214,8 @@ bool cdio_is_cdrom(std::string device) #ifdef __linux__ // Resolve symbolic links. This allows symbolic links to valid // drives to be passed from the command line with the -e flag. - char *devname = realpath(device.c_str(), NULL); + char resolved_path[MAX_PATH]; + char *devname = realpath(device.c_str(), resolved_path); if (!devname) return false; #endif @@ -234,11 +235,6 @@ bool cdio_is_cdrom(std::string device) } } -#ifdef __linux__ - if (devname) - free(devname); -#endif - devices.clear(); return res; }