vbox的更動 102899 路徑 trunk/src/VBox/Runtime/common/fs/fatvfs.cpp

時間撮記:

2024-1-16 下午02:24:57 (14 月 以前)

作者:

vboxsync

svn:sync-xref-src-repo-rev:

161121

訊息:

Runtime/common/fatvfs.cpp: Need to reset the S/G buffer when flushing the cluster map before writing the data, regression from r158845

The cluster map flushing code is directly modifying stuff in the S/G buffer structure instead of using the API but does it incorrectly.
This results in the members for the current segment pointer and remaining bytes remaining in the current segment to be NULL or 0 respectively.
The lower layer called through RTVfsFileSgWrite() will get a NULL pointer and 0 size for the current buffer when trying to access the S/G buffer
(stdfile in this case) causing no data to be written.
This worked before r158845 because the lower code would not actually use the S/G buffer but traverse the segment array directly not caring about
RTSGBUF::pvSegCur and RTSGBUF::cbSegLeft but was changed to use the RTSgBuf* API which will return NULL if both RTSGBUF::pvSegCur and RTSGBUF::cbSegLeft
are NULL or 0 respectively.

檔案:

• trunk/src/VBox/Runtime/common/fs/fatvfs.cpp (修改) (2 筆差異)

trunk/src/VBox/Runtime/common/fs/fatvfs.cpp

@@ -972 +972 @@
                                      || SgBuf.cSegs >= RT_ELEMENTS(aSgSegs))
                             {
+                                RTSgBufReset(&SgBuf);
                                 int rc2 = RTVfsFileSgWrite(pThis->hVfsBacking, off, &SgBuf, true /*fBlocking*/, NULL);
                                 if (RT_FAILURE(rc2) && RT_SUCCESS(rc))
                                     rc = rc2;
-                                RTSgBufReset(&SgBuf);
                                 SgBuf.cSegs = 0;
                                 off = offDirtyLine;
@@ -1004 +1004 @@
     if (SgBuf.cSegs > 0)
     {
+        RTSgBufReset(&SgBuf);
         int rc2 = RTVfsFileSgWrite(pThis->hVfsBacking, off, &SgBuf, true /*fBlocking*/, NULL);
         if (RT_FAILURE(rc2) && RT_SUCCESS(rc))