[tracker] revert Use g_strstr_len() instead of GNU extension memmem.
- From: Antoine Jacoutot <ajacoutot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker] revert Use g_strstr_len() instead of GNU extension memmem.
- Date: Wed, 8 May 2013 13:57:42 +0000 (UTC)
commit f741a8ef42f86d534c2de7c61025e9c828937496
Author: Antoine Jacoutot <ajacoutot gnome org>
Date: Wed May 8 15:55:53 2013 +0200
revert Use g_strstr_len() instead of GNU extension memmem.
This reverts cdae3a22e7a0001df7877e4ee3531e26158a6d56
g_strstr_len cannot be used in this case if @haystack or @needle
have embedded NULs.
src/tracker-extract/tracker-extract-mp3.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/tracker-extract/tracker-extract-mp3.c b/src/tracker-extract/tracker-extract-mp3.c
index 9189028..9b154f9 100644
--- a/src/tracker-extract/tracker-extract-mp3.c
+++ b/src/tracker-extract/tracker-extract-mp3.c
@@ -1049,10 +1049,10 @@ id3v2_strlen (const gchar encoding,
case 0x02:
/* UTF-16, string terminated by two NUL bytes */
- pos = g_strstr_len (text, len, "\0\0\0");
+ pos = memmem (text, len, "\0\0\0", 3);
if (pos == NULL) {
- pos = g_strstr_len (text, len, "\0\0");
+ pos = memmem (text, len, "\0\0", 2);
} else {
pos++;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]