summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Hindley <mark@hindley.org.uk>2018-11-12 09:22:56 +0000
committerMark Hindley <mark@hindley.org.uk>2018-11-12 09:22:56 +0000
commitbbd9a4f4692f71c86e74547a49ba45750bf48b05 (patch)
tree406ab8b54625e9f36f9362107621a47bcbfe175d
parenta7bee29ae34de50a86bf64d4ea9f69bdbc3b27e4 (diff)
parentf7eeda169864b15cf5b58a7daace4284b1bf5d35 (diff)
Merge branch 'Upstream_fix_issue_92' into debian_WIP
-rw-r--r--debian/patches/Fix_glibc_program_invocation_name_pointer_overlap.diff37
-rw-r--r--debian/patches/series1
2 files changed, 0 insertions, 38 deletions
diff --git a/debian/patches/Fix_glibc_program_invocation_name_pointer_overlap.diff b/debian/patches/Fix_glibc_program_invocation_name_pointer_overlap.diff
deleted file mode 100644
index 034bf292b..000000000
--- a/debian/patches/Fix_glibc_program_invocation_name_pointer_overlap.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Avoid SIGABRT if program_invocation_short_name is a pointer within progam_invocation_short_name
-Bug: https://github.com/elogind/elogind/issues/92
-
---- a/src/shared/musl_missing.c
-+++ b/src/shared/musl_missing.c
-@@ -26,14 +26,14 @@
- #if HAVE_PROGRAM_INVOCATION_NAME == 0
- char *program_invocation_name = NULL;
- char *program_invocation_short_name = NULL;
--#endif // libc does not provide these variables
-
--const char *program_arg_name = NULL;
-+const char *program_arg_name = NULL; /* Helper */
-+#endif // libc does not provide program_invocation_[short_]name
-
- #include "musl_missing.h"
-
-+#if HAVE_PROGRAM_INVOCATION_NAME == 0
- static void elogind_free_program_name(void) {
--
- if (program_invocation_name && (program_invocation_name != program_arg_name) && strlen(program_invocation_name))
- program_invocation_name = mfree(program_invocation_name);
- if (program_invocation_short_name && (program_invocation_short_name != program_arg_name) && strlen(program_invocation_short_name))
-@@ -55,8 +55,11 @@
- program_invocation_name = strdup(program_arg_name);
- if (NULL == program_invocation_short_name)
- program_invocation_short_name = strdup(basename(program_arg_name));
--#if HAVE_PROGRAM_INVOCATION_NAME == 0
- atexit(elogind_free_program_name);
--#endif // libc does not provide these variables
- }
-+#else
-+void elogind_set_program_name(const char* pcall) {
-+ assert(pcall && pcall[0]);
-+}
-+#endif // libc does not provide program_invocation_[short_]name
-
diff --git a/debian/patches/series b/debian/patches/series
index fb9c2028a..f98eee609 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
Disable_Dbus_activation_by_default.diff.patch
manpage-branding.diff
-Fix_glibc_program_invocation_name_pointer_overlap.diff