Skip to content

Commit 779c99f

Browse files
committed
Merge branch 'dt/refs-check-refname-component-sse-fix'
Fixes to a topic that is already in 'master'. * dt/refs-check-refname-component-sse-fix: refs: fix valgrind suppression file refs.c: handle REFNAME_REFSPEC_PATTERN at end of page
2 parents df4d7d5 + a8d9fea commit 779c99f

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

refs.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ int check_refname_format(const char *refname, int flags)
153153
const __m128i tilde_lb = _mm_set1_epi8('~' - 1);
154154

155155
int component_count = 0;
156+
int orig_flags = flags;
156157

157158
if (refname[0] == 0 || refname[0] == '/') {
158159
/* entirely empty ref or initial ref component */
@@ -178,7 +179,7 @@ int check_refname_format(const char *refname, int flags)
178179
* End-of-page; fall back to slow method for
179180
* this entire ref.
180181
*/
181-
return check_refname_format_bytewise(refname, flags);
182+
return check_refname_format_bytewise(refname, orig_flags);
182183

183184
tmp = _mm_loadu_si128((__m128i *)cp);
184185
tmp1 = _mm_loadu_si128((__m128i *)(cp + 1));

t/valgrind/default.supp

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,17 @@
5050
fun:copy_ref
5151
}
5252
{
53-
ignore-sse-check_refname_format
53+
ignore-sse-check_refname_format-addr
5454
Memcheck:Addr8
5555
fun:check_refname_format
56-
fun:cmd_check_ref_format
57-
fun:handle_builtin
58-
fun:main
56+
}
57+
{
58+
ignore-sse-check_refname_format-cond
59+
Memcheck:Cond
60+
fun:check_refname_format
61+
}
62+
{
63+
ignore-sse-check_refname_format-value
64+
Memcheck:Value8
65+
fun:check_refname_format
5966
}

0 commit comments

Comments
 (0)