Last active
November 13, 2021 17:00
-
-
Save roncapat/34eb82ece80ac26fd290a50dc7e85219 to your computer and use it in GitHub Desktop.
Patch for RSB build of GLIBC 2.46-2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- a/gio/gdbusauth.c | |
+++ b/gio/gdbusauth.c | |
@@ -1292,9 +1292,9 @@ | |
&line_length, | |
cancellable, | |
error); | |
- debug_print ("SERVER: WaitingForBegin, read '%s'", line); | |
if (line == NULL) | |
goto out; | |
+ debug_print ("SERVER: WaitingForBegin, read '%s'", line); | |
if (g_strcmp0 (line, "BEGIN") == 0) | |
{ | |
/* YAY, done! */ | |
--- a/gio/gdbusmessage.c | |
+++ b/gio/gdbusmessage.c | |
@@ -2695,7 +2695,6 @@ | |
if (message->body != NULL) | |
{ | |
gchar *tupled_signature_str; | |
- tupled_signature_str = g_strdup_printf ("(%s)", signature_str); | |
if (signature == NULL) | |
{ | |
g_set_error (error, | |
@@ -2703,10 +2702,10 @@ | |
G_IO_ERROR_INVALID_ARGUMENT, | |
_("Message body has signature '%s' but there is no signature header"), | |
signature_str); | |
- g_free (tupled_signature_str); | |
goto out; | |
} | |
- else if (g_strcmp0 (tupled_signature_str, g_variant_get_type_string (message->body)) != 0) | |
+ tupled_signature_str = g_strdup_printf ("(%s)", signature_str); | |
+ if (g_strcmp0 (tupled_signature_str, g_variant_get_type_string (message->body)) != 0) | |
{ | |
g_set_error (error, | |
G_IO_ERROR, | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- a/linux-user/syscall.c | |
+++ b/linux-user/syscall.c | |
@@ -7654,10 +7654,12 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, | |
#ifdef TARGET_NR_stime /* not on alpha */ | |
case TARGET_NR_stime: | |
{ | |
- time_t host_time; | |
- if (get_user_sal(host_time, arg1)) | |
+ struct timespec ts; | |
+ ts.tv_nsec = 0; | |
+ if (get_user_sal(ts.tv_sec, arg1)) { | |
return -TARGET_EFAULT; | |
- return get_errno(stime(&host_time)); | |
+ } | |
+ return get_errno(clock_settime(CLOCK_REALTIME, &ts)); | |
} | |
#endif | |
#ifdef TARGET_NR_alarm /* not on alpha */ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment