diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2003-08-13 19:37:40 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2003-08-13 19:37:40 +0000 |
| commit | e2b1a74c13df53496115dc4b0229079930e57db2 (patch) | |
| tree | ddec51ef5ff0ee62cf222a149a66549b753eb6bf /winsup/utils | |
| parent | db979bb4cfb8aa6d35a3627dc15044a7c4528cad (diff) | |
| download | cygnal-e2b1a74c13df53496115dc4b0229079930e57db2.tar.gz cygnal-e2b1a74c13df53496115dc4b0229079930e57db2.tar.bz2 cygnal-e2b1a74c13df53496115dc4b0229079930e57db2.zip | |
* dump_setup.cc (check_package_files): Fix extra '/' in filename.
Resize command buffer. Fix buffer overflow bug.
Diffstat (limited to 'winsup/utils')
| -rw-r--r-- | winsup/utils/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/utils/dump_setup.cc | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index e8bf2f2f6..b5de54d62 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,8 @@ +2003-08-13 Igor Pechtchanski <pechtcha@cs.nyu.edu> + + * dump_setup.cc (check_package_files): Fix extra '/' in filename. + Resize command buffer. Fix buffer overflow bug. + 2003-08-09 Igor Pechtchanski <pechtcha@cs.nyu.edu> Christopher Faylor <cgf@redhat.com> diff --git a/winsup/utils/dump_setup.cc b/winsup/utils/dump_setup.cc index 2a64b9021..300caf12f 100644 --- a/winsup/utils/dump_setup.cc +++ b/winsup/utils/dump_setup.cc @@ -237,7 +237,7 @@ file_exists (int verbose, char *filename, const char *alt, char *package) static bool check_package_files (int verbose, char *package) { - char filelist[MAX_PATH + 1] = "/etc/setup/"; + char filelist[MAX_PATH + 1] = "etc/setup/"; strcat (strcat (filelist, package), ".lst.gz"); if (!file_exists (false, filelist, NULL, NULL)) { @@ -253,8 +253,8 @@ check_package_files (int verbose, char *package) zcat = cygpath ("/bin/gzip.exe", NULL); while (char *p = strchr (zcat, '/')) *p = '\\'; - zcat = (char *) realloc (zcat, strlen (zcat) + sizeof (" -dc ") + 4096); - zcat_end = strchr (strcat (zcat, " -dc "), '\0'); + zcat = (char *) realloc (zcat, strlen (zcat) + sizeof (" -dc /") + MAX_PATH); + zcat_end = strchr (strcat (zcat, " -dc /"), '\0'); } strcpy (zcat_end, filelist); @@ -262,7 +262,7 @@ check_package_files (int verbose, char *package) bool result = true; char buf[MAX_PATH + 1]; - while (fgets (buf, 4096, fp)) + while (fgets (buf, MAX_PATH, fp)) { char *filename = strtok(buf, "\n"); if (filename[strlen (filename) - 1] == '/') |