From d6a7942ec457872e701cf9830362b0a07e9072d4 Mon Sep 17 00:00:00 2001
From: Tom Almeida <tommoa256@gmail.com>
Date: Wed, 14 Mar 2018 01:01:23 +0800
Subject: [PATCH] Change the type of byteset from [u8] to [usize] in strcspn
and strspn. Hopefully this is the last bug in these!
---
src/string/src/lib.rs | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/string/src/lib.rs b/src/string/src/lib.rs
index ca56dff00..9c8922018 100644
--- a/src/string/src/lib.rs
+++ b/src/string/src/lib.rs
@@ -8,6 +8,8 @@ extern crate errno;
extern crate platform;
extern crate stdlib;
+pub use compiler_builtins::mem::*;
+
use platform::types::*;
use errno::*;
use core::cmp;
@@ -125,7 +127,7 @@ pub unsafe extern "C" fn strcspn(s1: *const c_char, s2: *const c_char) -> c_ulon
// The below logic is effectively ripped from the musl implementation
- let mut byteset = [0u8; 32 / mem::size_of::<usize>()];
+ let mut byteset = [0usize; 32 / mem::size_of::<usize>()];
let mut i = 0;
while *s2.offset(i) != 0 {
@@ -277,7 +279,7 @@ pub unsafe extern "C" fn strspn(s1: *const c_char, s2: *const c_char) -> c_ulong
// The below logic is effectively ripped from the musl implementation
- let mut byteset = [0u8; 32 / mem::size_of::<usize>()];
+ let mut byteset = [0usize; 32 / mem::size_of::<usize>()];
let mut i = 0;
while *s2.offset(i) != 0 {
--
GitLab