luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-12 20:24:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/pwithnall/gutils-user-database-crash' into 'main'

Browse Source 
ci: Fix printing the execution environment

See merge request GNOME/glib!3921
This commit is contained in:
Philip Withnall
2024-02-13 23:44:56 +00:00
parent 4d120017e4 f3064e8a5c
commit 3a2dea839b
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.gitlab-ci.yml
View File

@@ -175,6 +175,9 @@ fedora-x86_64:
needs: [] needs: []
variables: variables:
CFLAGS: "-coverage -ftest-coverage -fprofile-arcs" CFLAGS: "-coverage -ftest-coverage -fprofile-arcs"
before_script:
- !reference [".build-linux", "before_script"]
- !reference [".with-git", "before_script"]
script: script:
- meson setup ${MESON_COMMON_OPTIONS} - meson setup ${MESON_COMMON_OPTIONS}
--werror --werror
@@ -227,6 +230,9 @@ debian-stable-x86_64:
image: $DEBIAN_IMAGE image: $DEBIAN_IMAGE
stage: build stage: build
needs: [] needs: []
before_script:
- !reference [".build-linux", "before_script"]
- !reference [".with-git", "before_script"]
script: script:
- meson setup ${MESON_COMMON_OPTIONS} - meson setup ${MESON_COMMON_OPTIONS}
--werror --werror
@@ -296,6 +302,9 @@ muslc-alpine-x86_64:
image: $ALPINE_IMAGE image: $ALPINE_IMAGE
stage: build stage: build
needs: [] needs: []
before_script:
- !reference [".build-linux", "before_script"]
- !reference [".with-git", "before_script"]
script: script:
- meson setup ${MESON_COMMON_OPTIONS} - meson setup ${MESON_COMMON_OPTIONS}
--werror --werror
@@ -368,6 +377,9 @@ G_DISABLE_ASSERT:
needs: [] needs: []
variables: variables:
MESON_TEST_TIMEOUT_MULTIPLIER: 15 MESON_TEST_TIMEOUT_MULTIPLIER: 15
before_script:
- !reference [".build-linux", "before_script"]
- !reference [".with-git", "before_script"]
script: script:
- meson setup ${MESON_COMMON_OPTIONS} - meson setup ${MESON_COMMON_OPTIONS}
--werror --werror
@@ -403,6 +415,9 @@ valgrind:
needs: [] needs: []
variables: variables:
MESON_TEST_TIMEOUT_MULTIPLIER: 15 MESON_TEST_TIMEOUT_MULTIPLIER: 15
before_script:
- !reference [".build-linux", "before_script"]
- !reference [".with-git", "before_script"]
script: script:
- meson setup ${MESON_COMMON_OPTIONS} - meson setup ${MESON_COMMON_OPTIONS}
--werror --werror

6
glib/gutils.c
View File

@@ -664,12 +664,12 @@ g_get_user_database_entry (void)
struct passwd *pw = NULL; struct passwd *pw = NULL;
gpointer buffer = NULL; gpointer buffer = NULL;
gint error; gint error;
gchar *logname; const char *logname;
# if defined (HAVE_GETPWUID_R) # if defined (HAVE_GETPWUID_R)
struct passwd pwd; struct passwd pwd;
# ifdef _SC_GETPW_R_SIZE_MAX # ifdef _SC_GETPW_R_SIZE_MAX
/* This reurns the maximum length */ /* This returns the maximum length */
glong bufsize = sysconf (_SC_GETPW_R_SIZE_MAX); glong bufsize = sysconf (_SC_GETPW_R_SIZE_MAX);
if (bufsize < 0) if (bufsize < 0)
@@ -678,7 +678,7 @@ g_get_user_database_entry (void)
glong bufsize = 64; glong bufsize = 64;
# endif /* _SC_GETPW_R_SIZE_MAX */ # endif /* _SC_GETPW_R_SIZE_MAX */
logname = (gchar *) g_getenv ("LOGNAME"); logname = g_getenv ("LOGNAME");
do do
{ {