diff options
| author | Max Khon <fjoe@FreeBSD.org> | 2004-06-14 20:56:00 +0000 |
|---|---|---|
| committer | Max Khon <fjoe@FreeBSD.org> | 2004-06-14 20:56:00 +0000 |
| commit | 694ecd186a9b12f5115b130cb96dc3428c8dc76b (patch) | |
| tree | f1a6e73aac755d8e00dfb5f10ac6a3618d9becf9 /misc/mc/files/patch-vfs-mcfs.c | |
| parent | - Strip binaries (diff) | |
- Fix CAN-2004-0226, CAN-2004-0231, CAN-2004-0232.
- Do not use :: in patch file names.
- Patch for CAN-2003-1023 is now contained in patch-vfs-direntry.c.
- Bump PORTREVISION.
Submitted by: Jakub Jelinek <jakub@redhat.com>
Diffstat (limited to 'misc/mc/files/patch-vfs-mcfs.c')
| -rw-r--r-- | misc/mc/files/patch-vfs-mcfs.c | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/misc/mc/files/patch-vfs-mcfs.c b/misc/mc/files/patch-vfs-mcfs.c new file mode 100644 index 000000000000..e5d41730432e --- /dev/null +++ b/misc/mc/files/patch-vfs-mcfs.c @@ -0,0 +1,27 @@ +--- vfs/mcfs.c.orig Fri Nov 15 13:49:39 2002 ++++ vfs/mcfs.c Tue Jun 15 03:15:09 2004 +@@ -756,8 +756,7 @@ + return NULL; + } + dirent_dest = mcfs_readdir_data.dent.d_name; +- strncpy (dirent_dest, mcfs_info->current->text, MC_MAXPATHLEN); +- dirent_dest[MC_MAXPATHLEN] = 0; ++ g_strlcpy (dirent_dest, mcfs_info->current->text, MC_MAXPATHLEN); + cached_lstat_info = &mcfs_info->current->my_stat; + mcfs_info->current = mcfs_info->current->next; + +@@ -985,9 +984,12 @@ + if (!rpc_get (mc->sock, RPC_STRING, &stat_str, RPC_END)) + return the_error (-1, EIO); + +- strncpy (buf, stat_str, size); ++ status = strlen (stat_str); ++ if (status < size) ++ size = status; ++ memcpy (buf, stat_str, size); + g_free (stat_str); +- return strlen (buf); ++ return size; + } + + static int |
