Changeset 268 for Include/Classes/System/String.ab

Timestamp:

Jun 2, 2007, 7:04:19 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

StringのResizeを呼ぶコンストラクタでメモリ確保されない場合を排除、ほか微修正

File:

• Include/Classes/System/String.ab (modified) (1 diff)

Include/Classes/System/String.ab

@@ -216 +216 @@
         Sub ReSize(allocLength As Long)
             If allocLength < 0 Then Exit Sub
-            If allocLength > m_Length Then
-                Dim oldLength As Long
-                oldLength = m_Length
-                If AllocStringBuffer(allocLength) <> 0 Then
+            Dim oldLength  = m_Length
+            If AllocStringBuffer(allocLength) <> 0 Then
+                If allocLength > oldLength Then
                     ZeroMemory(VarPtr(Chars[oldLength]), SizeOf (StrChar) * (m_Length - oldLength + 1))
+                Else
+                    Chars[m_Length] = 0
                 End If
-            Else
-                m_Length = allocLength
+            End If
+        End Sub
+
+        Sub ReSize(allocLength As Long, c As StrChar)
+            If allocLength < 0 Then Exit Sub
+            Dim oldLength = m_Length
+            If AllocStringBuffer(allocLength) <> 0 Then
+                If allocLength > oldLength Then
+                    _System_FillChar(VarPtr(Chars[oldLength]), (m_Length - oldLength) As SIZE_T, c)
+                End If
                 Chars[m_Length] = 0
             End If
-        End Sub
-
-        Sub ReSize(allocLength As Long, c As StrChar)
-            If allocLength < 0 Then
-                Exit Sub
-            ElseIf allocLength > m_Length Then
-                Dim oldLength As Long
-                oldLength = m_Length
-                If AllocStringBuffer(allocLength) <> 0 Then
-                    Dim p = VarPtr(Chars[oldLength]) As *StrChar
-                    Dim fillLen = m_Length - oldLength
-                    Dim i As Long
-                    For i = 0 To ELM(fillLen)
-                        p[i] = c
-                    Next
-                End If
-            Else
-                m_Length = allocLength
-            End If
-            Chars[m_Length] = 0
         End Sub