blob: 65d744f73632cac245d64bca4989594354828a47 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
--- misc.c.orig 1991-07-16 15:52:54 UTC
+++ misc.c
@@ -135,11 +135,16 @@ if available, else the short filename is
char *fullpath (direntry)
struct direntry *direntry;
{
- static char result[PATHSIZE];
+ static char result[PATHSIZE+PATHSIZE+12]; /* Room for enough space */
combine (result,
direntry->dirlen != 0 ? direntry->dirname : "",
(direntry->namlen != 0) ? direntry->lfname : direntry->fname
);
+
+ if (strlen (result) >= PATHSIZE) {
+ prterror ('f', "Combined dirname and filename too long\n");
+ }
+
return (result);
}
@@ -172,7 +177,11 @@ int preserve;
frd_zooh (header, zoo_file);
+#ifdef __LP64__
+ if ((int)(header->zoo_start + header->zoo_minus) != 0)
+#else
if ((header->zoo_start + header->zoo_minus) != 0L)
+#endif
prterror ('f', failed_consistency);
if (ver_too_high (header))
prterror ('f', wrong_version, header->major_ver, header->minor_ver);
|
