[SCM] faad2/master: Formal improvements of path_max.patch

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3c314228816b0f5771d9c2f081ef42211daf9000
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Fri Nov 11 14:33:20 2011 +0100

    Formal improvements of path_max.patch

diff --git a/debian/patches/path_max.patch b/debian/patches/path_max.patch
index 451d939..1352c54 100644
--- a/debian/patches/path_max.patch
+++ b/debian/patches/path_max.patch
@@ -1,7 +1,7 @@
 Description: Dynamically allocate file name buffers.
 Author: Fabian Greffrath <fabian+debian at greffrath.com>
 Bug-Ubuntu: https://launchpad.net/bugs/475050
-Last-Update: 2011-11-04
+Last-Update: 2011-11-11
 
 --- faad.orig/frontend/main.c
 +++ faad/frontend/main.c
@@ -12,41 +12,82 @@ Last-Update: 2011-11-04
 -    char aacFileName[255];
 -    char audioFileName[255];
 -    char adtsFileName[255];
-+    char *aacFileName;
-+    char *audioFileName;
-+    char *adtsFileName;
++    char *aacFileName = NULL;
++    char *audioFileName = NULL;
++    char *adtsFileName = NULL;
      unsigned char header[8];
      float length = 0;
      FILE *hMP4File;
-@@ -1157,6 +1157,7 @@ int main(int argc, char *argv[])
+@@ -1157,6 +1157,12 @@ int main(int argc, char *argv[])
              if (optarg)
              {
                  outfile_set = 1;
-+                audioFileName = (char *) malloc(strlen(optarg) + 1);
++                audioFileName = (char *) malloc(sizeof(char) * (strlen(optarg) + 1));
++                if (audioFileName == NULL)
++                {
++                    faad_fprintf(stderr, "Error allocating memory for audioFileName.\n");
++                    return 1;
++                }
                  strcpy(audioFileName, optarg);
              }
              break;
-@@ -1164,6 +1165,7 @@ int main(int argc, char *argv[])
+@@ -1164,6 +1170,12 @@ int main(int argc, char *argv[])
              if (optarg)
              {
                  adts_out = 1;
-+                adtsFileName = (char *) malloc(strlen(optarg) + 1);
++                adtsFileName = (char *) malloc(sizeof(char) * (strlen(optarg) + 1));
++                if (adtsFileName == NULL)
++                {
++                    faad_fprintf(stderr, "Error allocating memory for adtsFileName.\n");
++                    return 1;
++                }
                  strcpy(adtsFileName, optarg);
              }
              break;
-@@ -1284,6 +1286,7 @@ int main(int argc, char *argv[])
+@@ -1284,6 +1296,12 @@ int main(int argc, char *argv[])
  #endif
  
      /* point to the specified file name */
-+    aacFileName = (char *) malloc(strlen(argv[optind]) + 1);
++    aacFileName = (char *) malloc(sizeof(char) * (strlen(argv[optind]) + 1));
++    if (aacFileName == NULL)
++    {
++        faad_fprintf(stderr, "Error allocating memory for aacFileName.\n");
++        return 1;
++    }
      strcpy(aacFileName, argv[optind]);
  
  #ifdef _WIN32
-@@ -1297,6 +1300,7 @@ int main(int argc, char *argv[])
+@@ -1297,6 +1315,12 @@ int main(int argc, char *argv[])
       */
      if(!writeToStdio && !outfile_set)
      {
-+        audioFileName = (char *) malloc(strlen(aacFileName) + 1 + strlen(file_ext[format]) + 1);
++        audioFileName = (char *) malloc(sizeof(char) * (strlen(aacFileName) + 1 + strlen(file_ext[format]) + 1));
++        if (audioFileName == NULL)
++        {
++            faad_fprintf(stderr, "Error allocating memory for audioFileName.\n");
++            return 1;
++        }
          strcpy(audioFileName, aacFileName);
  
          fnp = (char *)strrchr(audioFileName,'.');
+@@ -1357,6 +1381,11 @@ int main(int argc, char *argv[])
+             old_format, &length);
+     }
+ 
++    if (audioFileName != NULL)
++      free (audioFileName);
++    if (adtsFileName != NULL)
++      free (adtsFileName);
++
+     if (!result && !infoOnly)
+     {
+ #ifdef _WIN32
+@@ -1372,5 +1401,8 @@ int main(int argc, char *argv[])
+             dec_length, length/dec_length);
+     }
+ 
++    if (aacFileName != NULL)
++      free (aacFileName);
++
+     return 0;
+ }

-- 
faad2 packaging