[vlc-commits] darwinvlc: check malloc return and free

Jean-Baptiste Kempf git at videolan.org
Sun Mar 5 02:10:20 CET 2017


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Mar  5 02:08:12 2017 +0100| [19c32473209436b69d50142659aa043e0672d5e2] | committer: Jean-Baptiste Kempf

darwinvlc: check malloc return and free

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=19c32473209436b69d50142659aa043e0672d5e2
---

 bin/darwinvlc.m | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/bin/darwinvlc.m b/bin/darwinvlc.m
index 981d7a9..d99eb49 100644
--- a/bin/darwinvlc.m
+++ b/bin/darwinvlc.m
@@ -248,12 +248,16 @@ int main(int i_argc, const char *ppsz_argv[])
             if (length > 0) {
                 CFIndex maxSize = CFStringGetMaximumSizeForEncoding(length, kCFStringEncodingUTF8);
                 lang = (char *)malloc(maxSize);
-                CFStringGetCString(language, lang, maxSize - 1, kCFStringEncodingUTF8);
-            }
-            if (strncmp( lang, "auto", 4 )) {
-                char tmp[11];
-                snprintf(tmp, 11, "LANG=%s", lang);
-                putenv(tmp);
+                if(lang) {
+                    CFStringGetCString(language, lang, maxSize - 1, kCFStringEncodingUTF8);
+                    if (strncmp( lang, "auto", 4 )) {
+                        char tmp[11];
+                        snprintf(tmp, 11, "LANG=%s", lang);
+                        putenv(tmp);
+
+                    }
+                }
+                free(lang);
             }
             CFRelease(language);
         }



More information about the vlc-commits mailing list