Changeset 413

Timestamp:

Jun 14, 2012, 1:34:38 PM (13 years ago)

Author:

pr

Message:

Fix buffer overwrite. Bug 1206.

Files:

• branches/branch-1-0/src/helpers/dosh.c (modified) (3 diffs)
• trunk/src/helpers/dosh.c (modified) (3 diffs)

branches/branch-1-0/src/helpers/dosh.c

@@ -1799 +1799 @@
  *@@changed V0.9.14 (2001-08-01) [umoeller]: fixed, this never respected cbBuf
  *@@changed V0.9.16 (2001-10-02) [umoeller]: added check for valid logical disk no
+ *@@changed V1.0.10 (2012-06-14) [pr]: fix buffer overwrite @@fixes 1206
  */
 
@@ -1827 +1828 @@
         if (arc == NO_ERROR)
         {
-            if (pszBuf)
+            if (pszBuf && cbBuf)
             {
                 // The data for the last three fields in the FSQBUFFER2
@@ -1836 +1837 @@
                         (CHAR*)(&pfsqBuffer->szName) + pfsqBuffer->cbName + 1,
                         cbBuf);         // V0.9.14 (2001-08-01) [umoeller]
-                *(pszBuf + cbBuf) = '\0';
+                *(pszBuf + cbBuf - 1) = '\0';
             }
         }

trunk/src/helpers/dosh.c

@@ -1799 +1799 @@
  *@@changed V0.9.14 (2001-08-01) [umoeller]: fixed, this never respected cbBuf
  *@@changed V0.9.16 (2001-10-02) [umoeller]: added check for valid logical disk no
+ *@@changed V1.0.10 (2012-06-14) [pr]: fix buffer overwrite @@fixes 1206
  */
 
@@ -1827 +1828 @@
         if (arc == NO_ERROR)
         {
-            if (pszBuf)
+            if (pszBuf && cbBuf)
             {
                 // The data for the last three fields in the FSQBUFFER2
@@ -1836 +1837 @@
                         (CHAR*)(&pfsqBuffer->szName) + pfsqBuffer->cbName + 1,
                         cbBuf);         // V0.9.14 (2001-08-01) [umoeller]
-                *(pszBuf + cbBuf) = '\0';
+                *(pszBuf + cbBuf - 1) = '\0';
             }
         }