averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[stdlib] Spot fix for https://bugs.swift.org/browse/SR-5401

Browse Source 
The simplest way to keep the string buffer alive is simply to always grab its
iterator, even if we're not going to use it.  Thanks @milseman for that idea and
@jckarter for the diagnosis help!
This commit is contained in:
Dave Abrahams
2017-07-11 14:58:29 -07:00
parent ba7b699b0f
commit 4f71d9e35c
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
stdlib/public/core/StringUnicodeScalarView.swift
View File

@@ -193,8 +193,9 @@ extension String {
/// collection.
public struct Iterator : IteratorProtocol {
init(_ _base: _StringCore) {
self._iterator = _base.makeIterator()
if _base.hasContiguousStorage {
self._baseSet = true
self._baseSet = true
if _base.isASCII {
self._ascii = true
self._asciiBase = UnsafeBufferPointer(
@@ -211,7 +212,6 @@ extension String {
} else {
self._ascii = false
self._baseSet = false
self._iterator = _base.makeIterator()
}
}
@@ -236,7 +236,7 @@ extension String {
result = _decoder.decode(&(self._base!))
}
} else {
result = _decoder.decode(&(self._iterator!))
result = _decoder.decode(&(self._iterator))
}
switch result {
case .scalarValue(let us):
@@ -252,7 +252,7 @@ extension String {
internal let _ascii: Bool
internal var _asciiBase: UnsafeBufferPointerIterator<UInt8>!
internal var _base: UnsafeBufferPointerIterator<UInt16>!
internal var _iterator: IndexingIterator<_StringCore>!
internal var _iterator: IndexingIterator<_StringCore>
}
/// Returns an iterator over the Unicode scalars that make up this view.