Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-09 01:46:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove _safe suffix from dc_decode_header function

Browse Source 
There is no longer unsafe version of this function, so suffix is
useless now.
This commit is contained in:
Dmitry Bogatov
2019-09-28 19:38:06 +00:00
committed by holger krekel
parent 618abd63cf
commit 0beadde758
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dc_mimeparser.rs
View File

@@ -127,7 +127,7 @@ impl<'a> MimeParser<'a> {
if (*field).fld_type == MAILIMF_FIELD_SUBJECT as libc::c_int { if (*field).fld_type == MAILIMF_FIELD_SUBJECT as libc::c_int {
let subj = (*(*field).fld_data.fld_subject).sbj_value; let subj = (*(*field).fld_data.fld_subject).sbj_value;
self.subject = as_opt_str(subj).map(dc_decode_header_words_safe); self.subject = as_opt_str(subj).map(dc_decode_header_words);
} }
} }
@@ -704,7 +704,7 @@ impl<'a> MimeParser<'a> {
// might be a wrongly encoded filename // might be a wrongly encoded filename
let s = to_string_lossy((*dsp_param).pa_data.pa_filename); let s = to_string_lossy((*dsp_param).pa_data.pa_filename);
// this is used only if the parts buffer stays empty // this is used only if the parts buffer stays empty
desired_filename = dc_decode_header_words_safe(&s) desired_filename = dc_decode_header_words(&s)
} }
} }
} }

4
src/dc_receive_imf.rs
View File

@@ -1076,7 +1076,7 @@ unsafe fn create_or_lookup_group(
} }
if let Some(optional_field) = mime_parser.lookup_optional_field("Chat-Group-Name") { if let Some(optional_field) = mime_parser.lookup_optional_field("Chat-Group-Name") {
grpname = Some(dc_decode_header_words_safe(&optional_field)); grpname = Some(dc_decode_header_words(&optional_field));
} }
if let Some(optional_field) = mime_parser.lookup_optional_field("Chat-Group-Member-Removed") { if let Some(optional_field) = mime_parser.lookup_optional_field("Chat-Group-Member-Removed") {
X_MrRemoveFromGrp = Some(optional_field); X_MrRemoveFromGrp = Some(optional_field);
@@ -1965,7 +1965,7 @@ unsafe fn add_or_lookup_contact_by_addr(
/* add addr_spec if missing, update otherwise */ /* add addr_spec if missing, update otherwise */
let mut display_name_dec = "".to_string(); let mut display_name_dec = "".to_string();
if !display_name_enc.is_null() { if !display_name_enc.is_null() {
let tmp = dc_decode_header_words_safe(as_str(display_name_enc)); let tmp = dc_decode_header_words(as_str(display_name_enc));
display_name_dec = normalize_name(&tmp); display_name_dec = normalize_name(&tmp);
} }
/*can be NULL*/ /*can be NULL*/

15
src/dc_strencode.rs
View File

@@ -68,7 +68,7 @@ fn quote_word(word: &[u8]) -> String {
* Encode/decode header words, RFC 2047 * Encode/decode header words, RFC 2047
******************************************************************************/ ******************************************************************************/
pub fn dc_decode_header_words_safe(input: &str) -> String { pub(crate) fn dc_decode_header_words(input: &str) -> String {
static FROM_ENCODING: &[u8] = b"iso-8859-1\x00"; static FROM_ENCODING: &[u8] = b"iso-8859-1\x00";
static TO_ENCODING: &[u8] = b"utf-8\x00"; static TO_ENCODING: &[u8] = b"utf-8\x00";
let mut out = ptr::null_mut(); let mut out = ptr::null_mut();
@@ -159,14 +159,11 @@ mod tests {
#[test] #[test]
fn test_dc_decode_header_words() { fn test_dc_decode_header_words() {
assert_eq!( assert_eq!(
dc_decode_header_words_safe("=?utf-8?B?dGVzdMOkw7bDvC50eHQ=?="), dc_decode_header_words("=?utf-8?B?dGVzdMOkw7bDvC50eHQ=?="),
std::string::String::from_utf8(b"test\xc3\xa4\xc3\xb6\xc3\xbc.txt".to_vec()).unwrap(), std::string::String::from_utf8(b"test\xc3\xa4\xc3\xb6\xc3\xbc.txt".to_vec()).unwrap(),
); );
assert_eq!( assert_eq!(dc_decode_header_words("just ascii test"), "just ascii test");
dc_decode_header_words_safe("just ascii test"),
"just ascii test"
);
assert_eq!(dc_encode_header_words("abcdef"), "abcdef"); assert_eq!(dc_encode_header_words("abcdef"), "abcdef");
@@ -176,12 +173,12 @@ mod tests {
assert!(r.starts_with("=?utf-8")); assert!(r.starts_with("=?utf-8"));
assert_eq!( assert_eq!(
dc_decode_header_words_safe(&r), dc_decode_header_words(&r),
std::string::String::from_utf8(b"test\xc3\xa4\xc3\xb6\xc3\xbc.txt".to_vec()).unwrap(), std::string::String::from_utf8(b"test\xc3\xa4\xc3\xb6\xc3\xbc.txt".to_vec()).unwrap(),
); );
assert_eq!( assert_eq!(
dc_decode_header_words_safe("=?ISO-8859-1?Q?attachment=3B=0D=0A_filename=3D?= =?ISO-8859-1?Q?=22test=E4=F6=FC=2Etxt=22=3B=0D=0A_size=3D39?="), dc_decode_header_words("=?ISO-8859-1?Q?attachment=3B=0D=0A_filename=3D?= =?ISO-8859-1?Q?=22test=E4=F6=FC=2Etxt=22=3B=0D=0A_size=3D39?="),
std::string::String::from_utf8(b"attachment;\r\n filename=\"test\xc3\xa4\xc3\xb6\xc3\xbc.txt\";\r\n size=39".to_vec()).unwrap(), std::string::String::from_utf8(b"attachment;\r\n filename=\"test\xc3\xa4\xc3\xb6\xc3\xbc.txt\";\r\n size=39".to_vec()).unwrap(),
); );
} }
@@ -246,7 +243,7 @@ mod tests {
#[test] #[test]
fn test_dc_header_roundtrip(input: String) { fn test_dc_header_roundtrip(input: String) {
let encoded = dc_encode_header_words(&input); let encoded = dc_encode_header_words(&input);
let decoded = dc_decode_header_words_safe(&encoded); let decoded = dc_decode_header_words(&encoded);
assert_eq!(input, decoded); assert_eq!(input, decoded);
} }