Commit Graph

22342 Commits

Author SHA1 Message Date
Simon McVittie
60c3c948b5 gio/tests/gdbus-peer: Exercise fds attached to a large message
This incidentally also exercises the intended pattern for sending fds in
a D-Bus message: the fd list is meant to contain exactly those fds that
are referenced by a handle (type 'h') in the body of the message, with
numeric handle value n corresponding to g_unix_fd_list_peek_fds(...)[n].

Being able to send and receive file descriptors that are not referenced by
a handle (as in OpenFile here) is a quirk of the GDBus API, and while it's
entirely possible in the wire protocol, other D-Bus implementations like
libdbus and sd-bus typically don't provide APIs that make this possible.

Reproduces: https://gitlab.gnome.org/GNOME/glib/-/issues/2074
Signed-off-by: Simon McVittie <smcv@collabora.com>
2020-10-28 14:59:57 +00:00
Simon McVittie
40cd84d9e4 gdbus: Cope with sending fds in a message that takes multiple writes
Suppose we are sending a 5K message with fds (so data->blob points
to 5K of data, data->blob_size is 5K, and fd_list is non-null), but
the kernel is only accepting up to 4K with each sendmsg().

The first time we get into write_message_continue_writing(),
data->total_written will be 0. We will try to write the entire message,
plus the attached file descriptors; or if the stream doesn't support
fd-passing (not a socket), we need to fail with
"Tried sending a file descriptor on unsupported stream".

Because the kernel didn't accept the entire message, we come back in.
This time, we won't enter the Unix-specific block that involves sending
fds, because now data->total_written is 4K, and it would be wrong to try
to attach the same fds again. However, we also need to avoid failing
with "Tried sending a file descriptor on unsupported stream" in this
case. We just want to write out the data of the rest of the message,
starting from (blob + total_written) (in this exaple, the last 1K).

Resolves: https://gitlab.gnome.org/GNOME/glib/-/issues/2074
Signed-off-by: Simon McVittie <smcv@collabora.com>
2020-10-28 14:59:57 +00:00
Emmanuele Bassi
cfbab734d1 Merge branch 'backport-1711-socket-fix-glib-2-66' into 'glib-2-66'
Backport !1711 “Fix race in socketclient-slow test” to glib-2-66

See merge request GNOME/glib!1723
2020-10-27 12:09:21 +00:00
Michael Catanzaro
832d09ad4b Fix race in socketclient-slow test
This test ensures that g_socket_client_connect_to_host_async() fails if
it is cancelled, but it's not cancelled until after 1 millisecond. Our
CI testers are hitting that race window, and Milan is able to reproduce
the crash locally as well. Switching it from 1ms to 0ms is enough for
Milan to avoid the crash, but not enough for our CI, so let's move the
cancellation to a GSocketClientEvent callback where the timing is
completely deterministic.

Hopefully fixes #2221
2020-10-27 11:36:06 +00:00
Philip Withnall
614d40941b Merge branch 'backport-1713-main-context-check-glib-2-66' into 'glib-2-66'
Backport !1713 “gmain: g_main_context_check() can skip updating polled FD sources” to glib-2-66

See merge request GNOME/glib!1721
2020-10-26 14:14:20 +00:00
Claudio Saavedra
fa45688ff6 gmain: g_main_context_check() can skip updating polled FD sources
If there is a file descriptor source that has a lower priority
than the one for sources that are going to be dispatched,
all subsequent file descriptor sources (internally sorted by
file descriptor identifier) do not get an update in their GPollRec
and later on wrong sources can be dispatched.

Fix this by first finding the first GPollRec that matches the current
GPollFD, instead of relying on it to be the current one. At
the same time, document the assumptions about the ordering of the
file descriptor records and array and make explicit in the documentation
that the array needs to be passed to g_main_context_check() as it was
received from g_main_context_query().

Added a new test that reproduces the bug by creating two file
descriptor sources and an idle one. Since the first
file descriptor created has a lower identifier and a low priority,
the second one is not dispatched even when it has the same, higher,
priority as the idle source. After fixing this bug, both
higher priority sources are dispatched as expected.

While this patch was written independently, a similar fix for this
bug was first submitted by Eugene M in GNOME/glib!562. Having a
second fix that basically does the same is a reassurance that we
are in the right here.

Fixes #1592
2020-10-26 13:09:19 +00:00
Emmanuele Bassi
cea485ac00 Merge branch 'backport-1718-clang-fix-glib-2-66' into 'glib-2-66'
Backport !1718 “gtrace: Add G_GNUC_PRINTF annotation” to glib-2-66

See merge request GNOME/glib!1720
2020-10-23 15:53:03 +00:00
Philip Withnall
848a534385 gtrace: Add G_GNUC_PRINTF annotation
This allows compilers to check the format placeholders properly. It
fixes compilation on clang, which gives a warning about untrusted
strings being passed on to subsequent functions which require format
placeholders.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
2020-10-23 16:05:21 +01:00
Philip Withnall
500db2e0b8 2.66.2
Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
2020-10-19 16:04:16 +01:00
Sebastian Dröge
a315624793 Merge branch 'backport-1706-nullable-annotations-glib-2-66' into 'glib-2-66'
Backport !1706 “Add various missing nullable annotations” to glib-2-66

See merge request GNOME/glib!1710
2020-10-19 13:08:32 +00:00
Sebastian Dröge
0643a75103 Merge branch 'backport-1683-six-days-to-eom-glib-2-66' into 'glib-2-66'
Backport !1683 “Fix the 6-days-until-the-end-of-the-month bug” to glib-2-66

See merge request GNOME/glib!1705
2020-10-19 12:00:57 +00:00
Sebastian Dröge
110e507c3a Add various missing nullable annotations 2020-10-19 12:49:29 +01:00
Руслан Ижбулатов
807e4fdcdb Fix the 6-days-until-the-end-of-the-month bug
The addition causes the date to shift
forward into 1st of the next month, because a 0-based offset
is compared to be "more than" the days in the month instead of "more than
or equal to".

This is triggered by corner-cases where transition date is 6 days
off the end of the month and our calculations put it at N+1th day of the
month (where N is the number of days in the month). The subtraction should
be triggered to move the date back a week, putting it 6 days off the end;
for example, October 25 for CET DST transition; but due to incorrect comparison
the date isn't shifted back, we add 31 days to October 1st and end up
at November 1st).

Fixes issue #2215.
2020-10-16 14:52:31 +01:00
Руслан Ижбулатов
3a0e77449c Add a test for the 6-days-until-EOM bug 2020-10-16 14:52:31 +01:00
Emmanuele Bassi
c014614a9b Merge branch 'backport-1661-timezone-fix-glib-2-66' into 'glib-2-66'
Backport !1661 “Lookup fallback time zones in the cache to improve performance” to glib-2-66

See merge request GNOME/glib!1700
2020-10-16 13:27:58 +00:00
Sebastian Dröge
cb8059291d Merge branch 'backport-1698-slice-getenv-win32-glib-2-66' into 'glib-2-66'
Backport !1698 “gslice: Inline win32 implementation of g_getenv() to avoid deadlock” to glib-2-66

See merge request GNOME/glib!1702
2020-10-16 11:59:44 +00:00
Philip Withnall
7f450baab7 gslice: Inline win32 implementation of g_getenv() to avoid deadlock
The win32 implementation of `g_getenv()` uses GSlice (from within
GQuark), which results in a deadlock when examining the `G_SLICE`
environment variable.

Fix that by inlining a basic implementation of `g_getenv()` at that call
site.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>

Fixes: #2225
2020-10-16 12:24:38 +01:00
Philip Withnall
976f48b438 tests: Add a basic test for GTimeZone caching
This tests the previous few commits.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
2020-10-15 15:58:03 +01:00
António Fernandes
cfe593a3de Revert "gtimezone: Cache timezones based on the identifier they were created by"
This reverts commit 851241f19a.

That commit avoids a performance regression but introduces a behavior regression:
changes to /etc/localtime have no effect for the remaining of the application's
runtime.

With the optimization introduced by the previous commit, we can pass NULL to
g_time_zone_new() repeatedly with no performance drawback, so we no longer have
to workaround this case.

Fixes: #2224
2020-10-15 15:58:03 +01:00
António Fernandes
3ab278dab0 gtimezone: Cache default timezone indefinitely
We cache GTimeZone instances to avoid expensive construction when the
same id is requested again.

However, if the NULL id is passed to g_time_zone_new(), we always
construct a new instance for the default/fallback timezone.

With the recent introduction of some heavy calculations[1], repeated
instance construction in such cases has visible performance impact in
nautilus list view and other such GtkTreeView consumers.

To avoid this, cache reference to a constructed default timezone and
use it the next time g_time_zone_new() is called with NULL argument,
as long as the default identifier doesn't change. We already did the
same for the local timezone[2].

Fixes: https://gitlab.gnome.org/GNOME/glib/-/issues/2204

Based on idea proposed by Sebastian Keller <skeller@gnome.org>.

[1] 25d950b61f
[2] 551e83662d
2020-10-15 15:58:03 +01:00
António Fernandes
19c5e13fc4 gtimezone: Set resolved_identifier earlier
We have been passing a &resolved_identifier address around for multiple
functions to set it. Each function may either:

    1.  leaving it for the next function to set, if returning early;
    2.  set it to a duplicate of the passed identifier, if not NULL;
    3.  get a fallback value and set it, otherwise.

This can be simplified by setting it early to either:

    1.  a duplicate of the passed identifier, if not NULL;
    2.  a fallback value, otherwise.

This way we can avoid some unnecessary string duplication and freeing.
Also, on Windows, we avoid calling windows_default_tzname() twice.

But the main motivation for this change is enabling the performance
optimization in the next commit.
2020-10-15 15:58:03 +01:00
António Fernandes
7124b91e21 gtimezone: Split out fallback timezone identification for unix
When the TZ environment variable is not set, we get the local timezone
identifier by reading specific files.

We are going to need these identifiers earlier, so split this logic into
its own function, in preparation for the next commit.

Based on idea proposed by Sebastian Keller <skeller@gnome.org>.
2020-10-15 15:58:03 +01:00
Sebastian Dröge
8cbe2da75e Merge branch 'backport-1691-source-locking-glib-2-66' into 'glib-2-66'
Backport !1691 “gmain: Fix possible locking issue in source unref” to glib-2-66

See merge request GNOME/glib!1693
2020-10-14 11:31:38 +00:00
Sebastian Dröge
114ae79388 Merge branch 'backport-1692-signal-unref-glib-2-66' into 'glib-2-66'
Backport !1692 “gsignal: Plug g_signal_connect_object leak” to glib-2-66

See merge request GNOME/glib!1694
2020-10-14 10:08:42 +00:00
Ray Strode
152a9b6abb gsignal: Plug g_signal_connect_object leak
commit 916297be79 added a hash table
to provide constant time lookups of signal handlers.

Unfortunately, that commit neglected to remove handlers from
g_signal_connect_object calls from the hash table that are
disconnected implicitly when the associated object goes away.

This commit addresses that bug by changing the closure invalidate
handler associated with the signal connection to properly remove the
handler from the hash table.
2020-10-14 10:38:17 +01:00
Benjamin Berg
6077ec3efa gmain: Fix possible locking issue in source unref
When unref'ing child sources, the lock is already held. But instead of
passing TRUE to g_source_unref_internal it currently passes whether the
lock was already held outside of the current invocation. Just pass TRUE
to fix this possible issue.
2020-10-14 10:33:26 +01:00
Dušan Kazik
0e8066e350 Update Slovak translation 2020-10-13 12:43:21 +00:00
Sebastian Dröge
99e334654a Merge branch 'backport-1687-uri-annotations-glib-2-66' into 'glib-2-66'
uri: add missing (not)nullable annotations

See merge request GNOME/glib!1689
2020-10-13 08:50:50 +00:00
Marc-André Lureau
ed6ef00c13 uri: add missing (not)nullable annotations
As suggested by Sebastian Dröge:
https://github.com/gtk-rs/glib/pull/697#pullrequestreview-505797722

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
2020-10-13 09:19:10 +01:00
Cheng-Chia Tseng
3248b7b670 Update Chinese (Taiwan) translation 2020-10-12 14:56:48 +00:00
Juliano de Souza Camargo
794af4ee4b Update Portuguese translation 2020-10-11 14:29:24 +00:00
Sebastian Dröge
3a6302c32a Merge branch 'backport-1684-fstatat-macos-glib-2-66' into 'glib-2-66'
Backport !1684 “glocalfileinfo: Fix use of fstatat() on macOS < 10.10” to glib-2-66

See merge request GNOME/glib!1685
2020-10-07 14:22:10 +00:00
Philip Withnall
d96a455b91 glocalfileinfo: Fix use of fstatat() on macOS < 10.10
`g_local_file_fstatat()` needs to fall back to returning an error if
`fstatat()` isn’t defined, which is the case on older versions of macOS
(as well as Windows, which was already handled). Callers shouldn’t call
`g_local_file_fstatat()` in these cases. (That’s already the case.)

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>

Fixes: #2203
2020-10-07 14:55:27 +01:00
Sebastian Dröge
4fe3389fbd Merge branch 'backport-1680-uri-escaping-glib-2-66' into 'glib-2-66'
Backport !1680 “guri: Fix UTF-8 validation when escaping URI components” to glib-2-66

See merge request GNOME/glib!1682
2020-10-07 13:29:38 +00:00
Philip Withnall
30a3a1360e guri: Add additional tests for scope ID parsing
These bump up the code coverage.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
2020-10-05 14:49:22 +01:00
Philip Withnall
439b290878 guri: Fix UTF-8 validation when escaping URI components
The return value from `g_utf8_get_char_validated()` is a `gunichar`,
which is unsigned, so comparing it with `> 0` is always going to return
true, even for return values `(gunichar) -1` and `(gunichar) -2`, which
indicate errors.

Handle them more explicitly.

oss-fuzz#26083

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
2020-10-05 14:49:22 +01:00
Philip Withnall
19d55caab7 tests: Refactor g_uri_escape_string() tests
This will allow more tests to be added easily in future. It introduces
no functional changes.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
2020-10-05 14:49:22 +01:00
Philip Withnall
b2f8ba8a11 2.66.1
Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
2020-10-01 14:16:20 +01:00
Sebastian Dröge
d536afeed8 Merge branch 'ossfuzz-22758-date-negative-overflow' into 'master'
gdatetime: Avoid integer overflow creating dates too far in the past

See merge request GNOME/glib!1671
2020-10-01 11:08:19 +00:00
Philip Withnall
281f6697c1 tests: Test date overflow failure with bookmark file parsing
This is exactly the test case from oss-fuzz which triggers a negative
overflow when constructing dates.

oss-fuzz#22758

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
2020-10-01 11:46:23 +01:00
Philip Withnall
b5656d2524 gdatetime: Avoid integer overflow creating dates too far in the past
oss-fuzz#22758

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
2020-10-01 11:46:15 +01:00
Philip Withnall
5464c4d292 Merge branch 'ossfuzz-23816-uri-parsing' into 'master'
guri: Fix URI scope parsing

See merge request GNOME/glib!1669
2020-10-01 10:14:45 +00:00
Philip Withnall
6762312ff2 tests: Add additional URI scope parsing tests
This bumps the coverage of `parse_host()` and `parse_ip_literal()` up to
100% of lines and branches.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
2020-09-30 19:42:26 +01:00
Philip Withnall
d2f324545b tests: Rework test_uri_parsing_absolute to support failure tests
This introduces no tests for failed parsing *yet*, but will allow them
to be added in future.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
2020-09-30 19:39:30 +01:00
Philip Withnall
b43fb9cbfb guri: Fix URI scope parsing
The previous parsing code could read off the end of a URI if it had an
incorrect %-escaped character in.

Fix that, and more closely implement parsing for the syntax defined in
RFC 6874, which is the amendment to RFC 3986 which specifies zone ID
syntax.

This requires reworking some network-address tests, which were
previously treating zone IDs incorrectly.

oss-fuzz#23816

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
2020-09-30 19:39:30 +01:00
Philip Withnall
c363c3a9a5 tests: Remove duplicate IPv6 zone ID URI parsing tests
Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
2020-09-30 19:39:09 +01:00
Philip Withnall
7e400a886e guri: Refactor error handling in parse_ip_literal()
Having the goto labels at the bottom of a function makes things a little
more readable. This introduces no functional changes.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
2020-09-30 19:39:09 +01:00
Philip Withnall
17a53f2fc7 guri: Simplify memory management in parse_host()
This introduces no functional changes, but makes the memory ownership a
little clearer and reduces the length of the code.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
2020-09-30 17:46:27 +01:00
Philip Withnall
58fce4b92b guri: Move IP-literal parsing out into a separate function
This introduces no functional changes, but will make future changes to
the code a little cleaner.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
2020-09-30 17:45:19 +01:00
Philip Withnall
aa6aa0de42 Merge branch '2209-fix-parse-res-text' into 'master'
gthreadedresolver: Fix logic in parse_res_text()

Closes #2209

See merge request GNOME/glib!1664
2020-09-30 15:45:06 +00:00