Changeset 208 for Include/Classes/System/Environment.ab

Timestamp:

Apr 7, 2007, 10:20:40 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

[207]参照型変数のNothing初期化に対応する修正

File:

• Include/Classes/System/Environment.ab (modified) (3 diffs)

Include/Classes/System/Environment.ab

@@ -21 +21 @@
         Dim size = GetCurrentDirectory(0, 0)
         Dim p = _System_malloc(SizeOf (TCHAR) * size) As PCTSTR
-        GetCurrentDirectory(size, p)
-        CurrentDirectory = p
-        _System_free(p)
+        Dim len = GetCurrentDirectory(size, p)
+        If len < size Then
+            CurrentDirectory = New String(p, size As Long)
+            _System_free(p)
+        End If
     End Function
 
@@ -72 +74 @@
             Dim size = GetSystemDirectory(0, 0)
             Dim p = _System_malloc(SizeOf (TCHAR) * size)
-            GetSystemDirectory(size, p)
-            sysDir = p
+            Dim len = GetSystemDirectory(size, p)
+            sysDir = New String(p, len As Long)
             _System_free(p)
         End IF
@@ -117 +119 @@
         Dim dst = _System_malloc(SizeOf (TCHAR) * size)
         ExpandEnvironmentStrings(src, dst, size)
-        ExpandEnvironmentVariables = dst
+        ExpandEnvironmentVariables = New String(dst, size - 1)
         _System_free(dst)
     End Function
 
     Static Sub FailFast(message As String)
-        OutputDebugString(ToTCStr(message))
-        ExitProcess(-1)
+        FatalAppExit(0, ToTCStr(message))
     End Sub