Changeset 850 for trunk/dll/autoview.c

Timestamp:

Oct 7, 2007, 4:50:15 AM (18 years ago)

Author:

Steven Levine

Message:

Rework large file support wrappers (ticket #41)
Add code to avoid NTFS driver small file read defect (ticket #159)
Add debug code to try to catch David's drive bar exception
Another attempt to correct newview fast viewer text load failure

File:

• trunk/dll/autoview.c (modified) (3 diffs)

trunk/dll/autoview.c

@@ -302 +302 @@
             HFILE handle;
             ULONG olen, ibufflen, action, obufflen, l;
-            CHAR *ibuff, *obuff, *p, buffer[80];
+            CHAR *ibuff, *obuff, *p;
+            // 06 Oct 07 SHL Protect against NTFS driver small buffer defect
+            // CHAR buffer[80];
+            CHAR buffer[4096];
             ARC_TYPE *info;
 
@@ -314 +317 @@
                          OPEN_FLAGS_RANDOMSEQUENTIAL | OPEN_SHARE_DENYNONE |
                          OPEN_ACCESS_READONLY, 0)) {
-              ibufflen = (AutoviewHeight < 96) ? 512 : 3072;
-              ibuff = xmalloc(ibufflen + 2, pszSrcFile, __LINE__);
+              ibufflen = AutoviewHeight < 96 ? 512 : 3072;
+              // 06 Oct 07 SHL protect against NTFS driver small buffer defect
+              // ibuff = xmalloc(ibufflen + 2, pszSrcFile, __LINE__);
+              ibuff = xmalloc(min(ibufflen + 2, 4096), pszSrcFile, __LINE__);
               if (ibuff) {
                 // Depends on CreateHexDump line width
@@ -322 +327 @@
                 if (obuff) {
                   *obuff = 0;
-                  if (!DosRead(handle,
-                               ibuff, ibufflen, &ibufflen) && ibufflen) {
+                  if (!DosRead(handle, ibuff, ibufflen, &ibufflen) &&
+                               ibufflen)
+                  {
                     ibuff[ibufflen] = 0;
                     p = obuff;