vbox的更動 60427 路徑 trunk/src

時間撮記:

2016-4-11 下午02:30:32 (9 年 以前)

作者:

vboxsync

訊息:

Runtime/linux/sysfs.cpp: Fixes for the tstRTSystemQueryDmi testcase, don't seek to the end of the file to get the file size because that is often bogus for sysfs entries (the indicated file size is much bigger than what can be read really). Fix an inconsistency in RTLinuxSysFsReadStrFileV() which would return a VERR_BUFFER_OVERFLOW error if the given buffer matches the string size if there is a newline end the end which is filtered out anyway. Small adjustment for RTLinuxSysFsWriteStr() to also write zero terminators if the string size is not given

檔案:

• trunk/src/VBox/Runtime/r3/linux/sysfs.cpp (修改) (5 筆差異)

trunk/src/VBox/Runtime/r3/linux/sysfs.cpp

@@ -238 +238 @@
         /* Check for EOF */
         uint64_t offCur = 0;
-        uint64_t offEnd = 0;
+        uint8_t bRead;
         rc = RTFileSeek(hFile, 0, RTFILE_SEEK_CURRENT, &offCur);
         if (RT_SUCCESS(rc))
-            rc = RTFileSeek(hFile, 0, RTFILE_SEEK_END, &offEnd);
-        if (   RT_SUCCESS(rc)
-            && offEnd > offCur)
-            rc = VERR_BUFFER_OVERFLOW;
+        {
+            int rc2 = RTFileRead(hFile, &bRead, 1, NULL);
+            if (RT_SUCCESS(rc2))
+            {
+                rc = VERR_BUFFER_OVERFLOW;
+
+                rc2 = RTFileSeek(hFile, offCur, RTFILE_SEEK_BEGIN, NULL);
+                if (RT_FAILURE(rc2))
+                    rc = rc2;
+            }
+            else if (rc2 != VERR_EOF)
+                rc = rc2;
+        }
     }
     return rc;
@@ -253 +262 @@
 {
     if (!cchBuf)
-        cchBuf = strlen(pszBuf);
+        cchBuf = strlen(pszBuf) + 1; /* Include the terminator */
     return RTFileWrite(hFile, pszBuf, cchBuf, pcchWritten);
 }
@@ -274 +283 @@
             /* Check for EOF */
             uint64_t offCur = 0;
-            uint64_t offEnd = 0;
+            uint8_t bRead;
             rc = RTFileSeek(hFile, 0, RTFILE_SEEK_CURRENT, &offCur);
             if (RT_SUCCESS(rc))
-                rc = RTFileSeek(hFile, 0, RTFILE_SEEK_END, &offEnd);
-            if (   RT_SUCCESS(rc)
-                && offEnd > offCur)
-                rc = VERR_BUFFER_OVERFLOW;
+            {
+                int rc2 = RTFileRead(hFile, &bRead, 1, NULL);
+                if (RT_SUCCESS(rc2))
+                {
+                    rc = VERR_BUFFER_OVERFLOW;
+
+                    rc2 = RTFileSeek(hFile, offCur, RTFILE_SEEK_BEGIN, NULL);
+                    if (RT_FAILURE(rc2))
+                        rc = rc2;
+                }
+                else if (rc2 != VERR_EOF)
+                    rc = rc2;
+            }
         }
     }
@@ -502 +520 @@
         size_t cchRead = 0;
         rc = RTLinuxSysFsReadStr(hFile, pszBuf, cchBuf, &cchRead);
-        RTFileClose(hFile);
         if (   RT_SUCCESS(rc)
             && cchRead > 0)
@@ -508 +525 @@
             char *pchNewLine = (char *)memchr(pszBuf, '\n', cchRead);
             if (pchNewLine)
+            {
                 *pchNewLine = '\0';
-        }
+                cchRead--;
+            }
+        }
+        else if (   rc == VERR_BUFFER_OVERFLOW
+                 && cchRead > 0)
+        {
+            /*
+             * Check if the last character would have been a newline we filter out
+             * anyway and revert the buffer overflow.
+             */
+            char achBuf[2];
+            size_t cchPeek = 0;
+            uint64_t offCur = 0;
+
+            int rc2 = RTFileSeek(hFile, 0, RTFILE_SEEK_CURRENT, &offCur);
+            if (RT_SUCCESS(rc2))
+            {
+                rc2 = RTLinuxSysFsReadStr(hFile, &achBuf[0], sizeof(achBuf), &cchPeek);
+                if (   RT_SUCCESS(rc2)
+                    && cchPeek > 0)
+                    rc2 = RTFileSeek(hFile, offCur, RTFILE_SEEK_BEGIN, NULL);
+                if (   RT_SUCCESS(rc2)
+                    && cchPeek > 0
+                    && achBuf[0] == '\n')
+                    rc = VINF_SUCCESS;
+            }
+        }
+
+        RTFileClose(hFile);
 
         if (pcchRead)