Merge remote-tracking branch 'origin/master' into swift-4.0-branch

swift-ci · swift-ci · commit d135acfc7e5d · 2017-08-11T02:32:28.000-07:00
diff --git a/CoreFoundation/NumberDate.subproj/CFTimeZone.c b/CoreFoundation/NumberDate.subproj/CFTimeZone.c
@@ -793,7 +793,7 @@ static CFTimeZoneRef __CFTimeZoneCreateSystem(void) {
         size_t zoneInfoDirLen = CFStringGetLength(__tzZoneInfo);
         if (strncmp(linkbuf, tzZoneInfo, zoneInfoDirLen) == 0) {
             name = CFStringCreateWithBytes(kCFAllocatorSystemDefault, (uint8_t *)linkbuf + zoneInfoDirLen,
-                                           strlen(linkbuf) - zoneInfoDirLen + 2, kCFStringEncodingUTF8, false);
+                                           strlen(linkbuf) - zoneInfoDirLen + 1, kCFStringEncodingUTF8, false);
         } else {
             name = CFStringCreateWithBytes(kCFAllocatorSystemDefault, (uint8_t *)linkbuf, strlen(linkbuf), kCFStringEncodingUTF8, false);
         }

Original file line number	Diff line number	Diff line change
`@@ -793,7 +793,7 @@ static CFTimeZoneRef __CFTimeZoneCreateSystem(void) {`
`793`	`793`	`size_t zoneInfoDirLen = CFStringGetLength(__tzZoneInfo);`
`794`	`794`	`if (strncmp(linkbuf, tzZoneInfo, zoneInfoDirLen) == 0) {`
`795`	`795`	`name = CFStringCreateWithBytes(kCFAllocatorSystemDefault, (uint8_t *)linkbuf + zoneInfoDirLen,`
`796`		`- strlen(linkbuf) - zoneInfoDirLen + 2, kCFStringEncodingUTF8, false);`
	`796`	`+ strlen(linkbuf) - zoneInfoDirLen + 1, kCFStringEncodingUTF8, false);`
`797`	`797`	`} else {`
`798`	`798`	`name = CFStringCreateWithBytes(kCFAllocatorSystemDefault, (uint8_t *)linkbuf, strlen(linkbuf), kCFStringEncodingUTF8, false);`
`799`	`799`	`}`