...and fix potential buffer overruns for even longer pathnames.
Fabian Greffrath
13 years ago
| 0 | Description: Extend file name buffers for longer path names. | |
| 0 | Description: Extend file name buffers for longer path names | |
| 1 | and fix potential buffer overruns for even longer pathnames. | |
| 1 | 2 | Author: Fabian Greffrath <fabian+debian@greffrath.com> |
| 2 | 3 | Forwarded: menno@audiocoding.com |
| 3 | 4 | |
| 4 | 5 | --- faad2.orig/frontend/main.c |
| 5 | 6 | +++ faad2/frontend/main.c |
| 6 | @@ -42,6 +42,7 @@ | |
| 7 | @@ -42,6 +42,11 @@ | |
| 7 | 8 | #include <stdlib.h> |
| 8 | 9 | #include <string.h> |
| 9 | 10 | #include <getopt.h> |
| 10 | 11 | +#include <limits.h> |
| 12 | + | |
| 13 | +#ifndef PATH_MAX | |
| 14 | +#define PATH_MAX 254 | |
| 15 | +#endif | |
| 11 | 16 | |
| 12 | 17 | #include <neaacdec.h> |
| 13 | 18 | #include <mp4ff.h> |
| 14 | @@ -1107,9 +1108,9 @@ int main(int argc, char *argv[]) | |
| 19 | @@ -1107,9 +1112,9 @@ int main(int argc, char *argv[]) | |
| 15 | 20 | int mp4file = 0; |
| 16 | 21 | int noGapless = 0; |
| 17 | 22 | char *fnp; |
| 24 | 29 | unsigned char header[8]; |
| 25 | 30 | float length = 0; |
| 26 | 31 | FILE *hMP4File; |
| 32 | @@ -1157,14 +1162,14 @@ int main(int argc, char *argv[]) | |
| 33 | if (optarg) | |
| 34 | { | |
| 35 | outfile_set = 1; | |
| 36 | - strcpy(audioFileName, optarg); | |
| 37 | + strncpy(audioFileName, optarg, PATH_MAX); | |
| 38 | } | |
| 39 | break; | |
| 40 | case 'a': | |
| 41 | if (optarg) | |
| 42 | { | |
| 43 | adts_out = 1; | |
| 44 | - strcpy(adtsFileName, optarg); | |
| 45 | + strncpy(adtsFileName, optarg, PATH_MAX); | |
| 46 | } | |
| 47 | break; | |
| 48 | case 's': | |
| 49 | @@ -1284,7 +1289,7 @@ int main(int argc, char *argv[]) | |
| 50 | #endif | |
| 51 | ||
| 52 | /* point to the specified file name */ | |
| 53 | - strcpy(aacFileName, argv[optind]); | |
| 54 | + strncpy(aacFileName, argv[optind], PATH_MAX); | |
| 55 | ||
| 56 | #ifdef _WIN32 | |
| 57 | begin = GetTickCount(); | |
| 58 | @@ -1297,14 +1302,14 @@ int main(int argc, char *argv[]) | |
| 59 | */ | |
| 60 | if(!writeToStdio && !outfile_set) | |
| 61 | { | |
| 62 | - strcpy(audioFileName, aacFileName); | |
| 63 | + strncpy(audioFileName, aacFileName, PATH_MAX); | |
| 64 | ||
| 65 | fnp = (char *)strrchr(audioFileName,'.'); | |
| 66 | ||
| 67 | if (fnp) | |
| 68 | fnp[0] = '\0'; | |
| 69 | ||
| 70 | - strcat(audioFileName, file_ext[format]); | |
| 71 | + strncat(audioFileName, file_ext[format], PATH_MAX - sizeof(file_ext[format])); | |
| 72 | } | |
| 73 | ||
| 74 | /* check for mp4 file */ | |