refactor: optimize hash table iterations and fix security issues #58

- refactor(core): replace g_hash_table_get_keys with g_hash_table_iter_init * Eliminates temporary GList allocations * Improves iteration performance * Affected: connection.c, cmd_defs.c, cmd_funcs.c, omemo.c, gpg.c, disco.c, form.c, autocompleters.c, capabilities.c, callbacks.c - fix(xmpp): correct queued_messages loop in connection.c:1031 * Remove incorrect NULL check that prevented message storage * calloc zeros array, causing loop to skip immediately * Fixes dropped messages during reconnection with SM enabled - fix(ui): prevent format string vulnerabilities in cons_show calls * Replace cons_show(variable) with cons_show("%s", variable) * Protects against format string attacks if variables contain % * Updated instances across cmd_funcs.c, connection.c, ox.c, console.c, core.c
fix: Refactor src/command/cmd_defs.c for metrics fix
2025-11-10 18:51:16 +03:00 · 2025-11-10 15:29:18 +03:00 · 2025-11-10 15:09:09 +03:00 · 2025-11-05 14:39:10 +03:00
58 changed files with 848 additions and 1728 deletions
--- a/.github/workflows/ci-code.yml
+++ b/.github/workflows/ci-code.yml
@@ -98,28 +98,3 @@ jobs:
      - name: Check spelling
        run: |
          codespell
-
-  coverage:
-    runs-on: ubuntu-latest
-    name: Code Coverage
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build and run coverage
-        run: |
-          docker build -f Dockerfile.debian -t profanity-cov .
-          docker run -v ${{ github.workspace }}/coverage:/coverage profanity-cov bash -c '
-            ./bootstrap.sh
-            ./configure --enable-coverage --enable-otr --enable-pgp --enable-omemo --enable-plugins
-            make -j$(nproc)
-            make check || true
-            make check-functional-parallel || true
-            lcov --capture --directory . --output-file /coverage/coverage.info \
-              --rc branch_coverage=1 \
-              --ignore-errors inconsistent
-            lcov --remove /coverage/coverage.info \
-              "/usr/include/*" "*/tests/*" \
-              --output-file /coverage/coverage.info \
-              --rc branch_coverage=1 \
-              --ignore-errors inconsistent,empty,unused
-            lcov --summary /coverage/coverage.info
-          '
--- a/.gitignore
+++ b/.gitignore
@@ -107,4 +107,3 @@ breaks
 *.tar.*
 *.zip
 *.log*
-coverage/
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -137,55 +137,3 @@ You can run the `make spell` command for this.

 `make doublecheck` will run the code formatter, spell checker and unit tests.

-
-### Functional tests
-
-The functional test suite uses [stabber](https://git.jabber.space/devs/stabber) as a mock XMPP server. Tests are located in `tests/functionaltests/`.
-
-#### Running functional tests
-
-Functional tests require stabber to be installed. Once installed, tests run as part of `make check`:
-
-```bash
-make check                      # Run all tests (unit + functional)
-make check-functional-parallel  # Run functional tests in parallel (~3x faster)
-./tests/functionaltests/functionaltests    # Run all functional tests sequentially
-./tests/functionaltests/functionaltests 1  # Run specific group (1-4)
-```
-
-#### Test groups
-
-Tests are organized into 4 groups for parallel execution:
-
-| Group | Description |
-|-------|-------------|
-| 1 | Connect, Ping, Rooms, Software |
-| 2 | Message, Receipts, Roster, Chat Session |
-| 3 | Presence, Disconnect |
-| 4 | MUC, Carbons |
-
-To add a new group:
-1. Define the test array in `functionaltests.c`
-2. Add entry to `groups[]` array
-3. Update `FUNC_TEST_GROUPS` in `Makefile.am`
-
-#### Writing functional tests
-
-Use content-based stubbing with stabber:
-
-```c
-// Use stbbr_for_query for IQ queries (roster, disco, etc.)
-stbbr_for_query("jabber:iq:roster", "<iq type='result'>...</iq>");
-
-// Use stbbr_send for presence, message, and push-style stanzas
-stbbr_send("<presence from='buddy@localhost'>...</presence>");
-```
-
-Guidelines:
-
-1. Use `stbbr_for_query(namespace, xml)` for IQ queries where the namespace is stable.
-2. Use `stbbr_send(xml)` for presence, message, and other push-style stanzas.
-3. Keep assertions tolerant of ordering when possible; use `prof_output_regex()` for flexible matching.
-4. If timing issues appear, use `prof_timeout()` around critical expectations and reset afterwards.
-5. When adding new tests, place them in the appropriate group based on functionality.
-
--- a/Dockerfile.arch
+++ b/Dockerfile.arch
@@ -1,23 +1,13 @@
 FROM archlinux

-ENV TERM=xterm
-ENV CC="ccache gcc"
-
-RUN pacman -Syu --noconfirm
-# reflector is optional - if it fails due to network issues, continue with default mirrorlist
-RUN pacman -S --needed --noconfirm reflector && \
-    (reflector --latest 20 --protocol https --sort rate --save /etc/pacman.d/mirrorlist || true)
-RUN pacman-key --init
-RUN pacman -S --needed --noconfirm \
+RUN pacman -Syu --noconfirm && pacman -S --needed --noconfirm \
  autoconf \
  autoconf-archive \
  automake \
  base-devel \
-  ccache \
  check \
  cmake \
  cmocka \
-  lcov \
  curl \
  debuginfod \
  doxygen \
@@ -25,7 +15,7 @@ RUN pacman -S --needed --noconfirm \
  gcc \
  git \
  gpgme \
-  gtk3 \
+  gtk2 \
  libgcrypt \
  libmicrohttpd \
  libnotify \
@@ -64,13 +54,13 @@ USER root
 RUN pacman -U --noconfirm libstrophe-git/libstrophe-git-*.pkg.tar.zst

 WORKDIR /usr/src
-RUN git clone --depth 1 -c http.sslverify=false https://git.jabber.space/devs/stabber
+#RUN git clone https://github.com/boothj5/stabber

-WORKDIR /usr/src/stabber
-RUN ./bootstrap.sh
-RUN ./configure --prefix=/usr --disable-dependency-tracking
-RUN make -j$(nproc)
-RUN make install
+#WORKDIR /usr/src/stabber
+#RUN ./bootstrap.sh
+#RUN ./configure --prefix=/usr --disable-dependency-tracking
+#RUN make
+#RUN make install

 WORKDIR /usr/src/profanity
 COPY . /usr/src/profanity
--- a/Dockerfile.debian
+++ b/Dockerfile.debian
@@ -1,18 +1,13 @@
 # Build the latest Debian testing image
 FROM debian:testing

-ENV DEBIAN_FRONTEND="noninteractive"
-ENV TERM=xterm
-ENV CC="ccache gcc"
-
 RUN apt-get update && apt-get install -y --no-install-recommends \
  autoconf \
  autoconf-archive \
  automake \
-  ccache \
+  expect \
  gcc \
  git \
-  lcov \
  libcmocka-dev \
  libcurl3-dev \
  libgcrypt-dev \
@@ -40,19 +35,19 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN mkdir -p /usr/src/{stabber,libstrophe,profanity}
 WORKDIR /usr/src

-RUN git clone --depth 1 -c http.sslverify=false https://git.jabber.space/devs/stabber
-RUN git clone --depth 1 -c http.sslverify=false https://github.com/strophe/libstrophe
+#RUN git clone https://github.com/boothj5/stabber
+RUN git clone -c http.sslverify=false https://github.com/strophe/libstrophe

-WORKDIR /usr/src/stabber
-RUN ./bootstrap.sh
-RUN ./configure --prefix=/usr --disable-dependency-tracking
-RUN make -j$(nproc)
-RUN make install
+#WORKDIR /usr/src/stabber
+#RUN ./bootstrap.sh
+#RUN ./configure --prefix=/usr --disable-dependency-tracking
+#RUN make
+#RUN make install

 WORKDIR /usr/src/libstrophe
 RUN ./bootstrap.sh
 RUN ./configure --prefix=/usr
-RUN make -j$(nproc)
+RUN make
 RUN make install

 WORKDIR /usr/src/profanity
--- a/Dockerfile.fedora
+++ b/Dockerfile.fedora
@@ -1,9 +1,7 @@
 # Build the latest Fedora image
 FROM fedora:latest

-ENV TERM=xterm
-ENV CC="ccache gcc"
-
+# expect - for functional tests
 # libmicrohttpd - for stabber
 # glibc-locale - to have en_US locale
 RUN dnf install -y \
@@ -11,10 +9,9 @@ RUN dnf install -y \
  autoconf-archive \
  automake \
  awk \
-  ccache \
+  expect-devel \
  gcc \
  git \
-  lcov \
  glib2-devel \
  glibc-all-langpacks \
  gtk2-devel \
@@ -45,25 +42,25 @@ RUN dnf install -y \
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
-ENV TERM=xterm

 RUN mkdir -p /usr/src
 WORKDIR /usr/src

-RUN git clone --depth 1 -c http.sslverify=false https://git.jabber.space/devs/stabber
-WORKDIR /usr/src/stabber
-RUN ./bootstrap.sh
-RUN ./configure --prefix=/usr --disable-dependency-tracking
-RUN make -j$(nproc)
-RUN make install
+#RUN mkdir -p /usr/src/stabber
+#RUN git clone https://github.com/boothj5/stabber
+#WORKDIR /usr/src/stabber
+#RUN ./bootstrap.sh
+#RUN ./configure --prefix=/usr --disable-dependency-tracking
+#RUN make
+#RUN make install

 WORKDIR /usr/src
 RUN mkdir -p /usr/src/libstrophe
-RUN git clone --depth 1 -c http.sslverify=false https://github.com/strophe/libstrophe
+RUN git clone -c http.sslverify=false https://github.com/strophe/libstrophe
 WORKDIR /usr/src/libstrophe
 RUN ./bootstrap.sh
 RUN ./configure --prefix=/usr
-RUN make -j$(nproc)
+RUN make
 RUN make install

 RUN mkdir -p /usr/src/profanity
--- a/Dockerfile.tumbleweed
+++ b/Dockerfile.tumbleweed
@@ -1,19 +1,16 @@
 # Build the latest openSUSE Tumbleweed image
 FROM opensuse/tumbleweed

-ENV TERM=xterm
-ENV CC="ccache gcc"
-
+# expect - for functional tests
 # libmicrohttpd - for stabber
 # glibc-locale - to have en_US locale
 RUN zypper --non-interactive in --no-recommends \
  autoconf \
  autoconf-archive \
  automake \
-  ccache \
+  expect-devel \
  gcc \
  git \
-  lcov \
  glib2-devel \
  glibc-locale \
  gtk2-devel \
@@ -44,17 +41,17 @@ RUN zypper --non-interactive in --no-recommends \
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
-ENV TERM=xterm

 RUN mkdir -p /usr/src
 WORKDIR /usr/src

-RUN git clone --depth 1 -c http.sslverify=false https://git.jabber.space/devs/stabber
-WORKDIR /usr/src/stabber
-RUN ./bootstrap.sh
-RUN ./configure --prefix=/usr --disable-dependency-tracking
-RUN make -j$(nproc)
-RUN make install
+#RUN mkdir -p /usr/src/stabber
+#RUN git clone git://github.com/boothj5/stabber.git
+#WORKDIR /usr/src/stabber
+#RUN ./bootstrap.sh
+#RUN ./configure --prefix=/usr --disable-dependency-tracking
+#RUN make
+#RUN make install

 RUN mkdir -p /usr/src/profanity
 WORKDIR /usr/src/profanity
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -1,17 +1,14 @@
 FROM ubuntu:latest

 ENV DEBIAN_FRONTEND="noninteractive"
-ENV TERM=xterm
-ENV CC="ccache gcc"

 RUN apt-get update && apt-get install -y --no-install-recommends \
  autoconf \
  autoconf-archive \
  automake \
-  ccache \
+  expect \
  gcc \
  git \
-  lcov \
  libcmocka-dev \
  libcurl3-dev \
  libgcrypt-dev \
@@ -39,19 +36,20 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN mkdir -p /usr/src/{stabber,libstrophe,profanity}
 WORKDIR /usr/src

-RUN git clone --depth 1 -c http.sslverify=false https://git.jabber.space/devs/stabber
-RUN git clone --depth 1 -c http.sslverify=false https://github.com/strophe/libstrophe
+#RUN git clone https://github.com/boothj5/stabber
+RUN git clone -c http.sslverify=false https://github.com/strophe/libstrophe

-WORKDIR /usr/src/stabber
-RUN ./bootstrap.sh
-RUN ./configure --prefix=/usr --disable-dependency-tracking
-RUN make -j$(nproc)
-RUN make install
+# TODO: Re-enable once libmicrohttpd-dev has been updated.
+#WORKDIR /usr/src/stabber
+#RUN ./bootstrap.sh
+#RUN ./configure --prefix=/usr --disable-dependency-tracking
+#RUN make
+#RUN make install

 WORKDIR /usr/src/libstrophe
 RUN ./bootstrap.sh
 RUN ./configure --prefix=/usr
-RUN make -j$(nproc)
+RUN make
 RUN make install

 WORKDIR /usr/src/profanity
--- a/Makefile.am
+++ b/Makefile.am
@@ -286,50 +286,25 @@ endif

 TESTS = tests/unittests/unittests
 check_PROGRAMS = tests/unittests/unittests
-tests_unittests_unittests_CPPFLAGS = -I$(srcdir)/tests
+tests_unittests_unittests_CPPFLAGS = -Itests/
 tests_unittests_unittests_SOURCES = $(unittest_sources)
 tests_unittests_unittests_LDADD = -lcmocka

-# Functional tests require libstabber.
-# They are only built when libstabber is available.
-# See: https://github.com/profanity-im/profanity/pull/1010
-#      https://github.com/profanity-im/stabber/issues/5
+# Functional test were commented out because of:
+# https://github.com/profanity-im/profanity/pull/1010
+# An issue was raised for stabber:
+# https://github.com/profanity-im/stabber/issues/5
+# Once this issue is resolved functional tests should be enabled again
 #
-# Note: We use forkpty() instead of libexpect for PTY handling.
-
-if HAVE_STABBER
-if HAVE_FORKPTY
-TESTS += tests/functionaltests/functionaltests
-check_PROGRAMS += tests/functionaltests/functionaltests
-tests_functionaltests_functionaltests_SOURCES = $(functionaltest_sources)
-tests_functionaltests_functionaltests_CPPFLAGS = -I$(srcdir)/tests
-tests_functionaltests_functionaltests_CFLAGS = $(AM_CFLAGS)
-tests_functionaltests_functionaltests_LDADD = -lcmocka -lstabber @FORKPTY_LIB@
-
-# Parallel functional tests target (~3x faster than sequential)
-# Usage: make check-functional-parallel
-# To add more groups: increase FUNC_TEST_GROUPS and add group in functionaltests.c
-FUNC_TEST_GROUPS = 1 2 3 4
-
-check-functional-parallel: tests/functionaltests/functionaltests
-	@echo "Running functional tests in parallel ($(words $(FUNC_TEST_GROUPS)) groups)..."
-	@mkdir -p $(builddir)/test-logs
-	@pids=""; \
-	for g in $(FUNC_TEST_GROUPS); do \
-		./tests/functionaltests/functionaltests $$g > $(builddir)/test-logs/group$$g.log 2>&1 & \
-		pids="$$pids $$!"; \
-	done; \
-	failed=0; i=1; \
-	for pid in $$pids; do \
-		wait $$pid || { echo "Group $$i FAILED"; cat $(builddir)/test-logs/group$$i.log; failed=1; }; \
-		i=$$((i + 1)); \
-	done; \
-	echo "=== Test Results Summary ==="; \
-	grep -E 'PASSED|FAILED|Running' $(builddir)/test-logs/group*.log || true; \
-	if [ $$failed -ne 0 ]; then echo "FUNCTIONAL TESTS FAILED"; exit 1; fi; \
-	echo "All functional test groups passed!"
-endif
-endif
+#if HAVE_STABBER
+#if HAVE_EXPECT
+#TESTS += tests/functionaltests/functionaltests
+#check_PROGRAMS += tests/functionaltests/functionaltests
+#tests_functionaltests_functionaltests_SOURCES = $(functionaltest_sources)
+#tests_functionaltests_functionaltests_CFLAGS = $(AM_CFLAGS) -I/usr/include/tcl8.6 -I/usr/include/tcl8.5
+#tests_functionaltests_functionaltests_LDADD = -lcmocka -lstabber -lexpect
+#endif
+#endif

 man1_MANS = $(man1_sources)

@@ -390,20 +365,6 @@ check-unit: tests/unittests/unittests
@VALGRIND_CHECK_RULES@
 VALGRIND_SUPPRESSIONS_FILES=prof.supp

-# Code coverage targets (requires --enable-coverage)
-coverage-clean:
-	find . -name '*.gcda' -delete
-	find . -name '*.gcno' -delete
-	rm -rf coverage-html coverage.info
-
-coverage-report: check
-	lcov --capture --directory . --output-file coverage.info --ignore-errors inconsistent
-	lcov --remove coverage.info '/usr/*' '*/tests/*' --output-file coverage.info --ignore-errors inconsistent
-	genhtml coverage.info --output-directory coverage-html
-	@echo "Coverage report generated in coverage-html/index.html"
-
-.PHONY: coverage-clean coverage-report
-
 format: $(all_c_sources)
 	clang-format -i $(all_c_sources)

--- a/apidocs/c/profapi.h
+++ b/apidocs/c/profapi.h
@@ -20,13 +20,13 @@
 typedef char* PROF_WIN_TAG;

 /** Function pointer for command callbacks, accepting an array of arguments. */
-typedef void (*CMD_CB)(char** args);
+typedef void(*CMD_CB)(char **args);

 /** Function pointer for timed callbacks, accepting no arguments. */
-typedef void (*TIMED_CB)(void);
+typedef void(*TIMED_CB)(void);

 /** Function pointer for window callbacks, accepting a window tag and input line. */
-typedef void (*WINDOW_CB)(PROF_WIN_TAG win, char* line);
+typedef void(*WINDOW_CB)(PROF_WIN_TAG win, char *line);

 /** Highlights the console window in the status bar. */
 void prof_cons_alert(void);
@@ -41,7 +41,7 @@ void prof_cons_alert(void);
 * prof_cons_show("This will appear in the console window");
 * @endcode
 */
-int prof_cons_show(const char* const message);
+int prof_cons_show(const char * const message);

 /**
 * Shows a message in the console with a specified theme.
@@ -57,7 +57,7 @@ int prof_cons_show(const char* const message);
 * prof_cons_show_themed("myplugin", "text", NULL, "Plugin themed message");
 * @endcode
 */
-int prof_cons_show_themed(const char* const group, const char* const item, const char* const def, const char* const message);
+int prof_cons_show_themed(const char *const group, const char *const item, const char *const def, const char *const message);

 /**
 * Shows a message indicating a command was used incorrectly.
@@ -69,7 +69,7 @@ int prof_cons_show_themed(const char* const group, const char* const item, const
 * prof_cons_bad_cmd_usage("/mycommand");
 * @endcode
 */
-int prof_cons_bad_cmd_usage(const char* const cmd);
+int prof_cons_bad_cmd_usage(const char *const cmd);

 /**
 * Registers a new command with help information and callback.
@@ -91,9 +91,9 @@ int prof_cons_bad_cmd_usage(const char* const cmd);
 * prof_register_command("/newcommand", 1, 2, synopsis, "Example command", args, examples, my_function);
 * @endcode
 */
-void prof_register_command(const char* command_name, int min_args, int max_args,
-                           char** synopsis, const char* description, char* arguments[][2], char** examples,
-                           CMD_CB callback);
+void prof_register_command(const char *command_name, int min_args, int max_args,
+    char **synopsis, const char *description, char *arguments[][2], char **examples,
+    CMD_CB callback);

 /**
 * Registers a function to be called periodically by CProof.
@@ -118,7 +118,7 @@ void prof_register_timed(TIMED_CB callback, int interval_seconds);
 * prof_completer_add("/mycommand", items);
 * @endcode
 */
-void prof_completer_add(const char* key, char** items);
+void prof_completer_add(const char *key, char **items);

 /**
 * Removes autocomplete values for a command or argument.
@@ -131,7 +131,7 @@ void prof_completer_add(const char* key, char** items);
 * prof_completer_remove("/mycommand", items);
 * @endcode
 */
-void prof_completer_remove(const char* key, char** items);
+void prof_completer_remove(const char *key, char **items);

 /**
 * Clears all autocomplete values for a command or argument.
@@ -142,7 +142,7 @@ void prof_completer_remove(const char* key, char** items);
 * prof_completer_clear("/mycommand");
 * @endcode
 */
-void prof_completer_clear(const char* key);
+void prof_completer_clear(const char *key);

 /**
 * Adds filepath autocompletion for a command or argument.
@@ -153,7 +153,7 @@ void prof_completer_clear(const char* key);
 * prof_filepath_completer_add("/filecmd");
 * @endcode
 */
-void prof_filepath_completer_add(const char* prefix);
+void prof_filepath_completer_add(const char *prefix);

 /**
 * Sends a desktop notification.
@@ -166,7 +166,7 @@ void prof_filepath_completer_add(const char* prefix);
 * prof_notify("Example notification", 5000, "Example plugin");
 * @endcode
 */
-void prof_notify(const char* message, int timeout_ms, const char* category);
+void prof_notify(const char *message, int timeout_ms, const char *category);

 /**
 * Sends a line of input to CProof to execute.
@@ -177,7 +177,7 @@ void prof_notify(const char* message, int timeout_ms, const char* category);
 * prof_send_line("/who online");
 * @endcode
 */
-void prof_send_line(char* line);
+void prof_send_line(char *line);

 /**
 * Gets the Jabber ID of the current chat recipient.
@@ -185,17 +185,6 @@ void prof_send_line(char* line);
 */
 char* prof_get_current_recipient(void);

-/**
- * Gets the title of the current window as shown in the titlebar.
- *
- * Special cases:
- * - MUC configuration window: Includes "config" and an asterisk if modified (e.g., "room@example.com config *").
- * - vCard window: Includes the bare JID and an asterisk if modified (e.g., "vCard user@example.com *").
- *
- * @return A null-terminated string containing the window title. The caller must free the returned string.
- */
-char* prof_get_current_window(void);
-
 /**
 * Gets the Jabber ID of the current chat room.
 * @return The room Jabber ID (e.g., "metalchat@conference.example.com") or NULL if not in a room.
@@ -209,7 +198,7 @@ char* prof_get_current_muc(void);
 int prof_current_win_is_console(void);

 /**
- * Gets the user's nickname in the current chat room.
+ * Gets the user’s nickname in the current chat room.
 * @return The nickname (e.g., "eddie") or NULL if not in a room.
 */
 char* prof_get_current_nick(void);
@@ -219,14 +208,14 @@ char* prof_get_current_nick(void);
 * @param barejid The Jabber ID.
 * @return The nickname (e.g., "eddie") or the barejid if not in the roster.
 */
-char* prof_get_name_from_roster(const char* barejid);
+char* prof_get_name_from_roster(const char *barejid);

 /**
 * Gets the barejid for a nickname from the roster.
 * @param name The nickname.
 * @return The barejid (e.g., "eddie@server.tld") or NULL if not in the roster.
 */
-char* prof_get_barejid_from_roster(const char* name);
+char* prof_get_barejid_from_roster(const char *name);

 /**
 * Gets nicknames of all occupants in the current chat room.
@@ -236,10 +225,10 @@ char** prof_get_current_occupants(void);

 /**
 * Gets the current nickname in a chat room.
- * @param barejid The room's Jabber ID.
+ * @param barejid The room’s Jabber ID.
 * @return The nickname.
 */
-char* prof_get_room_nick(const char* barejid);
+char* prof_get_room_nick(const char *barejid);

 /**
 * Logs a debug message to the CProof log.
@@ -250,7 +239,7 @@ char* prof_get_room_nick(const char* barejid);
 * prof_log_debug("Debug message");
 * @endcode
 */
-void prof_log_debug(const char* message);
+void prof_log_debug(const char *message);

 /**
 * Logs an info message to the CProof log.
@@ -261,7 +250,7 @@ void prof_log_debug(const char* message);
 * prof_log_info("Info message");
 * @endcode
 */
-void prof_log_info(const char* message);
+void prof_log_info(const char *message);

 /**
 * Logs a warning message to the CProof log.
@@ -272,7 +261,7 @@ void prof_log_info(const char* message);
 * prof_log_warning("Warning message");
 * @endcode
 */
-void prof_log_warning(const char* message);
+void prof_log_warning(const char *message);

 /**
 * Logs an error message to the CProof log.
@@ -283,7 +272,7 @@ void prof_log_warning(const char* message);
 * prof_log_error("Error message");
 * @endcode
 */
-void prof_log_error(const char* message);
+void prof_log_error(const char *message);

 /**
 * Creates a plugin window.
@@ -332,7 +321,7 @@ int prof_win_focus(PROF_WIN_TAG win);
 * prof_win_show("My Plugin", "Message in plugin window");
 * @endcode
 */
-int prof_win_show(PROF_WIN_TAG win, char* message);
+int prof_win_show(PROF_WIN_TAG win, char *message);

 /**
 * Shows a message in a plugin window with a specified theme.
@@ -349,7 +338,7 @@ int prof_win_show(PROF_WIN_TAG win, char* message);
 * prof_win_show_themed("My Plugin", "myplugin", "text", NULL, "Themed message");
 * @endcode
 */
-int prof_win_show_themed(PROF_WIN_TAG tag, char* group, char* key, char* def, char* message);
+int prof_win_show_themed(PROF_WIN_TAG tag, char *group, char *key, char *def, char *message);

 /**
 * Sends an XMPP stanza.
@@ -361,7 +350,7 @@ int prof_win_show_themed(PROF_WIN_TAG tag, char* group, char* key, char* def, ch
 * prof_send_stanza("<iq to='juliet@capulet.lit' id='s2c1' type='get'><ping xmlns='urn:xmpp:ping'/></iq>");
 * @endcode
 */
-int prof_send_stanza(char* stanza);
+int prof_send_stanza(char *stanza);

 /**
 * Gets a boolean setting.
@@ -376,7 +365,7 @@ int prof_send_stanza(char* stanza);
 * prof_settings_boolean_get("myplugin", "notify", 0);
 * @endcode
 */
-int prof_settings_boolean_get(char* group, char* key, int def);
+int prof_settings_boolean_get(char *group, char *key, int def);

 /**
 * Sets a boolean setting.
@@ -390,7 +379,7 @@ int prof_settings_boolean_get(char* group, char* key, int def);
 * prof_settings_boolean_set("myplugin", "activate", 1);
 * @endcode
 */
-void prof_settings_boolean_set(char* group, char* key, int value);
+void prof_settings_boolean_set(char *group, char *key, int value);

 /**
 * Gets a string setting.
@@ -405,7 +394,7 @@ void prof_settings_boolean_set(char* group, char* key, int value);
 * prof_settings_string_get("myplugin", "prefix", "prefix-->");
 * @endcode
 */
-char* prof_settings_string_get(char* group, char* key, char* def);
+char* prof_settings_string_get(char *group, char *key, char *def);

 /**
 * Sets a string setting.
@@ -419,7 +408,7 @@ char* prof_settings_string_get(char* group, char* key, char* def);
 * prof_settings_string_set("myplugin", "prefix", "myplugin, ");
 * @endcode
 */
-void prof_settings_string_set(char* group, char* key, char* value);
+void prof_settings_string_set(char *group, char *key, char *value);

 /**
 * Gets a string list setting, separated by semicolons.
@@ -433,7 +422,7 @@ void prof_settings_string_set(char* group, char* key, char* value);
 * prof_settings_string_list_get("myplugin", "somelist");
 * @endcode
 */
-char** prof_settings_string_list_get(char* group, char* key);
+char** prof_settings_string_list_get(char *group, char *key);

 /**
 * Adds an item to a string list setting.
@@ -448,7 +437,7 @@ char** prof_settings_string_list_get(char* group, char* key);
 * prof_settings_string_list_add("myplugin", "somelist", "anelement");
 * @endcode
 */
-void prof_settings_string_list_add(char* group, char* key, char* value);
+void prof_settings_string_list_add(char *group, char *key, char *value);

 /**
 * Removes an item from a string list setting.
@@ -463,7 +452,7 @@ void prof_settings_string_list_add(char* group, char* key, char* value);
 * prof_settings_string_list_remove("myplugin", "somelist", "anelement");
 * @endcode
 */
-int prof_settings_string_list_remove(char* group, char* key, char* value);
+int prof_settings_string_list_remove(char *group, char *key, char *value);

 /**
 * Clears all items from a string list setting.
@@ -477,7 +466,7 @@ int prof_settings_string_list_remove(char* group, char* key, char* value);
 * prof_settings_string_list_clear("myplugin", "somelist");
 * @endcode
 */
-int prof_settings_string_list_clear(char* group, char* key);
+int prof_settings_string_list_clear(char *group, char *key);

 /**
 * Gets an integer setting.
@@ -492,7 +481,7 @@ int prof_settings_string_list_clear(char* group, char* key);
 * prof_settings_int_get("myplugin", "timeout", 10);
 * @endcode
 */
-int prof_settings_int_get(char* group, char* key, int def);
+int prof_settings_int_get(char *group, char *key, int def);

 /**
 * Sets an integer setting.
@@ -506,7 +495,7 @@ int prof_settings_int_get(char* group, char* key, int def);
 * prof_settings_int_set("myplugin", "timeout", 100);
 * @endcode
 */
-void prof_settings_int_set(char* group, char* key, int value);
+void prof_settings_int_set(char *group, char *key, int value);

 /**
 * Triggers handling of an incoming message as if received by CProof.
@@ -519,10 +508,10 @@ void prof_settings_int_set(char* group, char* key, int value);
 * prof_incoming_message("bob@server.org", "laptop", "Hello there");
 * @endcode
 */
-void prof_incoming_message(char* barejid, char* resource, char* message);
+void prof_incoming_message(char *barejid, char *resource, char *message);

 /**
- * Adds a service discovery feature to CProof's supported features.
+ * Adds a service discovery feature to CProof’s supported features.
 * Sends a presence update if a session is connected.
 * @param feature The feature to add.
 *
@@ -531,7 +520,7 @@ void prof_incoming_message(char* barejid, char* resource, char* message);
 * prof_disco_add_feature("urn:xmpp:omemo:0:devicelist+notify");
 * @endcode
 */
-void prof_disco_add_feature(char* feature);
+void prof_disco_add_feature(char *feature);

 /**
 * Ends an encrypted session with a user.
@@ -542,7 +531,7 @@ void prof_disco_add_feature(char* feature);
 * prof_encryption_reset("alice@server.org");
 * @endcode
 */
-void prof_encryption_reset(char* barejid);
+void prof_encryption_reset(char *barejid);

 /**
 * Sets the titlebar encryption indicator text for a recipient.
@@ -555,10 +544,10 @@ void prof_encryption_reset(char* barejid);
 * prof_chat_set_titlebar_enctext("bob@example.com", "safe");
 * @endcode
 */
-int prof_chat_set_titlebar_enctext(char* barejid, char* enctext);
+int prof_chat_set_titlebar_enctext(char *barejid, char *enctext);

 /**
- * Resets the titlebar encryption indicator for a recipient to CProof's default.
+ * Resets the titlebar encryption indicator for a recipient to CProof’s default.
 * @param barejid Jabber ID of the recipient.
 * @return 1 on success, 0 on failure.
 *
@@ -567,7 +556,7 @@ int prof_chat_set_titlebar_enctext(char* barejid, char* enctext);
 * prof_chat_unset_titlebar_enctext("bob@example.com");
 * @endcode
 */
-int prof_chat_unset_titlebar_enctext(char* barejid);
+int prof_chat_unset_titlebar_enctext(char *barejid);

 /**
 * Sets the incoming message prefix character for a contact.
@@ -580,7 +569,7 @@ int prof_chat_unset_titlebar_enctext(char* barejid);
 * prof_chat_set_incoming_char("kristine@example.com", "*");
 * @endcode
 */
-int prof_chat_set_incoming_char(char* barejid, char* ch);
+int prof_chat_set_incoming_char(char *barejid, char *ch);

 /**
 * Resets the incoming message prefix character for a contact.
@@ -592,7 +581,7 @@ int prof_chat_set_incoming_char(char* barejid, char* ch);
 * prof_chat_unset_incoming_char("kristine@example.com");
 * @endcode
 */
-int prof_chat_unset_incoming_char(char* barejid);
+int prof_chat_unset_incoming_char(char *barejid);

 /**
 * Sets the outgoing message prefix character for a contact.
@@ -605,7 +594,7 @@ int prof_chat_unset_incoming_char(char* barejid);
 * prof_chat_set_outgoing_char("david@example.com", "+");
 * @endcode
 */
-int prof_chat_set_outgoing_char(char* barejid, char* ch);
+int prof_chat_set_outgoing_char(char *barejid, char *ch);

 /**
 * Resets the outgoing message prefix character for a contact.
@@ -617,7 +606,7 @@ int prof_chat_set_outgoing_char(char* barejid, char* ch);
 * prof_chat_unset_outgoing_char("david@example.com");
 * @endcode
 */
-int prof_chat_unset_outgoing_char(char* barejid);
+int prof_chat_unset_outgoing_char(char *barejid);

 /**
 * Sets the titlebar encryption indicator text for a room.
@@ -630,10 +619,10 @@ int prof_chat_unset_outgoing_char(char* barejid);
 * prof_room_set_titlebar_enctext("generalchat@conference.service.com", "secret");
 * @endcode
 */
-int prof_room_set_titlebar_enctext(char* roomjid, char* enctext);
+int prof_room_set_titlebar_enctext(char *roomjid, char *enctext);

 /**
- * Resets the titlebar encryption indicator for a room to CProof's default.
+ * Resets the titlebar encryption indicator for a room to CProof’s default.
 * @param roomjid Jabber ID of the room.
 * @return 1 on success, 0 on failure.
 *
@@ -642,7 +631,7 @@ int prof_room_set_titlebar_enctext(char* roomjid, char* enctext);
 * prof_room_unset_titlebar_enctext("generalchat@conference.service.com");
 * @endcode
 */
-int prof_room_unset_titlebar_enctext(char* roomjid);
+int prof_room_unset_titlebar_enctext(char *roomjid);

 /**
 * Sets the message prefix character for a room.
@@ -655,7 +644,7 @@ int prof_room_unset_titlebar_enctext(char* roomjid);
 * prof_room_set_message_char("ohnoes@conference.example.com", "^");
 * @endcode
 */
-int prof_room_set_message_char(char* roomjid, char* ch);
+int prof_room_set_message_char(char *roomjid, char *ch);

 /**
 * Resets the message prefix character for a room.
@@ -667,7 +656,7 @@ int prof_room_set_message_char(char* roomjid, char* ch);
 * prof_room_unset_message_char("ohnoes@conference.example.com");
 * @endcode
 */
-int prof_room_unset_message_char(char* roomjid);
+int prof_room_unset_message_char(char *roomjid);

 /**
 * Shows a message in a chat window.
@@ -680,7 +669,7 @@ int prof_room_unset_message_char(char* roomjid);
 * prof_chat_show("bob@server.org", "From a plugin in the chat window");
 * @endcode
 */
-int prof_chat_show(char* barejid, char* message);
+int prof_chat_show(char *barejid, char *message);

 /**
 * Shows a message in a chat window with a theme and prefix character.
@@ -698,7 +687,7 @@ int prof_chat_show(char* barejid, char* message);
 * prof_chat_show_themed("bob@server.org", "myplugin", "text", NULL, "!", "Themed message");
 * @endcode
 */
-int prof_chat_show_themed(char* barejid, char* group, char* item, char* def, char* ch, char* message);
+int prof_chat_show_themed(char *barejid, char *group, char *item, char *def, char *ch, char *message);

 /**
 * Shows a message in a chat room window.
@@ -711,7 +700,7 @@ int prof_chat_show_themed(char* barejid, char* group, char* item, char* def, cha
 * prof_room_show("chat@conference.example.com", "From a plugin in the chat room");
 * @endcode
 */
-int prof_room_show(char* roomjid, char* message);
+int prof_room_show(char *roomjid, char *message);

 /**
 * Shows a message in a chat room window with a theme and prefix character.
@@ -729,4 +718,4 @@ int prof_room_show(char* roomjid, char* message);
 * prof_room_show_themed("chat@conference.example.com", "myplugin", "text", NULL, "!", "Themed message");
 * @endcode
 */
-int prof_room_show_themed(char* roomjid, char* group, char* item, char* def, char* ch, char* message);
+int prof_room_show_themed(char *roomjid, char *group, char *item, char *def, char *ch, char *message);
--- a/apidocs/python/src/prof.py
+++ b/apidocs/python/src/prof.py
@@ -830,22 +830,6 @@ def get_current_recipient() -> str | None:
    """
    pass

-def get_current_window() -> str:
-    """Retrieves the title of the current window as shown in the titlebar.
-
-    Returns the title of the currently active window, matching the titlebar display.
-    Special cases:
-    - For MUC configuration windows, includes "config" and an asterisk if modified (e.g., "room@example.com config \*").
-    - For vCard windows, includes the bare JID and an asterisk if modified (e.g., "vCard user@example.com \*").
-
-    :return: The window title as a string.
-
-    Example::
-
-        title = prof.get_current_window()
-        prof.cons_show(f"Current window: {title}")
-    """
-
 def get_current_muc() -> str | None:
    """Retrieves the Jabber ID of the current chat room.

--- a/ci-build.sh
+++ b/ci-build.sh
@@ -23,79 +23,6 @@ error_handler()

 trap error_handler ERR

-# Verify that test failures are properly detected
-# This is a meta-test: it runs a deliberately failing test
-# and checks that the test framework reports the failure correctly
-verify_test_failure_detection()
-{
-    echo
-    echo "==> Verifying test failure detection..."
-    
-    # Create a simple failing test
-    cat > /tmp/test_must_fail.c << 'EOF'
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
-
-static void test_that_must_fail(void **state) {
-    (void)state;
-    assert_true(0); // This MUST fail
-}
-
-int main(void) {
-    const struct CMUnitTest tests[] = {
-        cmocka_unit_test(test_that_must_fail),
-    };
-    return cmocka_run_group_tests(tests, NULL, NULL);
-}
-EOF
-    
-    # Compile the failing test
-    if ! gcc -o /tmp/test_must_fail /tmp/test_must_fail.c -lcmocka 2>/dev/null; then
-        echo "Warning: Could not compile test failure verification (cmocka not available?)"
-        echo "Skipping test failure detection verification"
-        return 0
-    fi
-    
-    # Test 1: Single failing test detection
-    echo "  Testing single test failure detection..."
-    if /tmp/test_must_fail > /tmp/test_must_fail.log 2>&1; then
-        echo "ERROR: Test that should fail returned success (exit code 0)"
-        echo "This means the test framework is NOT detecting failures correctly!"
-        echo "--- Test output ---"
-        cat /tmp/test_must_fail.log
-        echo "--- End output ---"
-        rm -f /tmp/test_must_fail /tmp/test_must_fail.c /tmp/test_must_fail.log
-        exit 1
-    fi
-    echo "  ✓ Single test failure correctly detected"
-    
-    # Test 2: Parallel failure detection (simulates check-functional-parallel)
-    echo "  Testing parallel test failure detection..."
-    failed=0
-    /tmp/test_must_fail > /tmp/p1.log 2>&1 & pid1=$!
-    true > /tmp/p2.log 2>&1 & pid2=$!  # This passes
-    /tmp/test_must_fail > /tmp/p3.log 2>&1 & pid3=$!
-    true > /tmp/p4.log 2>&1 & pid4=$!  # This passes
-    
-    wait $pid1 || failed=$((failed + 1))
-    wait $pid2 || failed=$((failed + 1))
-    wait $pid3 || failed=$((failed + 1))
-    wait $pid4 || failed=$((failed + 1))
-    
-    if [ $failed -ne 2 ]; then
-        echo "ERROR: Expected 2 failures in parallel tests, got $failed"
-        echo "Parallel failure detection is broken!"
-        rm -f /tmp/test_must_fail /tmp/test_must_fail.c /tmp/test_must_fail.log /tmp/p?.log
-        exit 1
-    fi
-    echo "  ✓ Parallel test failures correctly detected (2 of 4 failed as expected)"
-    
-    rm -f /tmp/test_must_fail /tmp/test_must_fail.c /tmp/test_must_fail.log /tmp/p?.log
-    echo "✓ Test failure detection verified"
-}
-
 num_cores()
 {
    # Check for cores, for systems with:
@@ -107,9 +34,6 @@ num_cores()
        || getconf _NPROCESSORS_ONLN 2>/dev/null
 }

-# Run test failure detection verification first
-verify_test_failure_detection
-
 ./bootstrap.sh

 tests=()
@@ -120,39 +44,49 @@ ARCH="$(uname | tr '[:upper:]' '[:lower:]')"

 case "$ARCH" in
    linux*)
-        # 4 configurations for parallel CI
        tests=(
-        # 1. Full build (all features enabled)
        "--enable-notifications --enable-icons-and-clipboard --enable-otr --enable-pgp
        --enable-omemo --enable-plugins --enable-c-plugins
        --enable-python-plugins --with-xscreensaver --enable-omemo-qrcode --enable-gdk-pixbuf"
-        # 2. Minimal build (all optional features disabled)
        "--disable-notifications --disable-icons-and-clipboard --disable-otr --disable-pgp
        --disable-omemo --disable-plugins --disable-c-plugins
-        --disable-python-plugins --without-xscreensaver --disable-omemo-qrcode --disable-gdk-pixbuf"
-        # 3. No encryption (disable otr, pgp, omemo)
-        "--disable-pgp --disable-otr --disable-omemo --disable-omemo-qrcode"
-        # 4. Default configuration
-        ""
-        )
+        --disable-python-plugins --without-xscreensaver"
+        "--disable-notifications"
+        "--disable-icons-and-clipboard"
+        "--disable-otr"
+        "--disable-pgp"
+        "--disable-omemo --disable-omemo-qrcode"
+        "--disable-pgp --disable-otr"
+        "--disable-pgp --disable-otr --disable-omemo"
+        "--disable-plugins"
+        "--disable-python-plugins"
+        "--disable-c-plugins"
+        "--disable-c-plugins --disable-python-plugins"
+        "--without-xscreensaver"
+        "--disable-gdk-pixbuf"
+        "")
        source /etc/profile.d/debuginfod.sh 2>/dev/null || true
        ;;
    darwin*)
-        # 4 configurations for parallel CI
        tests=(
-        # 1. Full build (all features enabled)
        "--enable-notifications --enable-icons-and-clipboard --enable-otr --enable-pgp
        --enable-omemo --enable-plugins --enable-c-plugins
        --enable-python-plugins"
-        # 2. Minimal build (all optional features disabled)
        "--disable-notifications --disable-icons-and-clipboard --disable-otr --disable-pgp
        --disable-omemo --disable-plugins --disable-c-plugins
        --disable-python-plugins"
-        # 3. No encryption (disable otr, pgp, omemo)
+        "--disable-notifications"
+        "--disable-icons-and-clipboard"
+        "--disable-otr"
+        "--disable-pgp"
+        "--disable-omemo"
+        "--disable-pgp --disable-otr"
        "--disable-pgp --disable-otr --disable-omemo"
-        # 4. Default configuration
-        ""
-        )
+        "--disable-plugins"
+        "--disable-python-plugins"
+        "--disable-c-plugins"
+        "--disable-c-plugins --disable-python-plugins"
+        "")
        ;;
    openbsd*)
        MAKE="gmake"
@@ -162,32 +96,36 @@ case "$ARCH" in
        # src/event/server_events.c:1454:19: error: universal character names are only valid in C++ and C99
        CC="egcc -std=gnu99 -fexec-charset=UTF-8"

-        # 4 configurations for parallel CI
        tests=(
-        # 1. Full build (all features enabled)
        "--enable-notifications --enable-icons-and-clipboard --enable-otr --enable-pgp
        --enable-omemo --enable-plugins --enable-c-plugins
        --enable-python-plugins"
-        # 2. Minimal build (all optional features disabled)
        "--disable-notifications --disable-icons-and-clipboard --disable-otr --disable-pgp
        --disable-omemo --disable-plugins --disable-c-plugins
        --disable-python-plugins"
-        # 3. No encryption (disable otr, pgp, omemo)
+        "--disable-notifications"
+        "--disable-icons-and-clipboard"
+        "--disable-otr"
+        "--disable-pgp"
+        "--disable-omemo"
+        "--disable-pgp --disable-otr"
        "--disable-pgp --disable-otr --disable-omemo"
-        # 4. Default configuration
-        ""
-        )
+        "--disable-plugins"
+        "--disable-python-plugins"
+        "--disable-c-plugins"
+        "--disable-c-plugins --disable-python-plugins"
+        "")
        ;;
 esac

 case "$ARCH" in
    linux*)
         echo
-         echo "--> Building with ./configure -C ${tests[0]} --enable-valgrind $*"
+         echo "--> Building with ./configure ${tests[0]} --enable-valgrind $*"
         echo

         # shellcheck disable=SC2086
-        ./configure -C ${tests[0]} --enable-valgrind $*
+        ./configure ${tests[0]} --enable-valgrind $*

        $MAKE CC="${CC}"
        if grep '^ID=' /etc/os-release | grep -q -e debian; then
@@ -199,73 +137,18 @@ case "$ARCH" in
        ;;
 esac

-# Function to build and test a single configuration
-build_and_test() {
-    local features="$1"
-    local extra_args="$2"
-    local idx="$3"
-    local build_dir="build-$idx"
-    local log_file="build-$idx.log"
-
-    {
-        echo "=== Build $idx started at $(date) ==="
-        echo "--> Building in $build_dir with ./configure -C $features $extra_args"
-
-        mkdir -p "$build_dir"
-        cd "$build_dir"
-
-        # shellcheck disable=SC2086
-        ../configure -C $features $extra_args
-
-        $MAKE CC="${CC}"
-        $MAKE check-functional-parallel
-
-        ./profanity -v
-        $MAKE clean
-
-        cd ..
-        rm -rf "$build_dir"
-
-        echo "=== Build $idx completed at $(date) ==="
-    } > "$log_file" 2>&1
-}
-
-# Run all 4 configurations in parallel
-echo "Starting parallel builds..."
-pids=()
-for idx in 1 2 3 4; do
-    if [ $idx -le ${#tests[@]} ]; then
-        build_and_test "${tests[$((idx-1))]}" "$*" "$idx" &
-        pids+=("$!")
-        echo "Started build $idx (PID: $!)" 
-    fi
-done
-
-# Wait for all builds and check exit codes
-failed=0
-for i in "${!pids[@]}"; do
-    idx=$((i + 1))
-    if wait "${pids[$i]}"; then
-        echo "✓ Build $idx passed"
-    else
-        echo "✗ Build $idx failed"
-        echo "--- Log for build $idx ---"
-        cat "build-$idx.log"
-        echo "--- End log ---"
-        failed=1
-    fi
-done
-
-# Show all logs on success too
-if [ $failed -eq 0 ]; then
+for features in "${tests[@]}"
+do
    echo
-    echo "All builds passed!"
-    for idx in 1 2 3 4; do
-        if [ -f "build-$idx.log" ]; then
-            echo "--- Log for build $idx ---"
-            cat "build-$idx.log"
-        fi
-    done
-else
-    exit 1
-fi
+    echo "--> Building with ./configure ${features} $*"
+    echo
+
+    # shellcheck disable=SC2086
+    ./configure $features $*
+
+    $MAKE CC="${CC}"
+    $MAKE check
+
+    ./profanity -v
+    $MAKE clean
+done
--- a/configure.ac
+++ b/configure.ac
@@ -69,8 +69,6 @@ AC_ARG_ENABLE([gdk-pixbuf],
    [AS_HELP_STRING([--enable-gdk-pixbuf], [enable GDK Pixbuf support to scale avatars before uploading])])
 AC_ARG_ENABLE([omemo-qrcode],
    [AS_HELP_STRING([--enable-omemo-qrcode], [enable ability to display omemo qr code])])
-AC_ARG_ENABLE([coverage],
-    [AS_HELP_STRING([--enable-coverage], [enable code coverage analysis])])

 m4_include([m4/ax_valgrind_check.m4])
 AX_VALGRIND_DFLT([drd], [off])
@@ -376,23 +374,14 @@ PKG_CHECK_MODULES([cmocka], [cmocka], [],
 AM_CONDITIONAL([HAVE_STABBER], [false])
 AC_CHECK_LIB([stabber], [stbbr_start], [AM_CONDITIONAL([HAVE_STABBER], [true])],
    [AC_MSG_NOTICE([libstabber not found, will not be able to run functional tests])])
-dnl Check for forkpty (needed for functional tests PTY handling)
-dnl On Linux it's in libutil, on some BSDs it's in libc
-AM_CONDITIONAL([HAVE_FORKPTY], [false])
-AC_CHECK_LIB([util], [forkpty], [AM_CONDITIONAL([HAVE_FORKPTY], [true]) FORKPTY_LIB="-lutil"],
-    [AC_CHECK_FUNC([forkpty], [AM_CONDITIONAL([HAVE_FORKPTY], [true]) FORKPTY_LIB=""],
-        [AC_MSG_NOTICE([forkpty not found, will not be able to run functional tests])])])
-AC_SUBST([FORKPTY_LIB])
+AM_CONDITIONAL([HAVE_EXPECT], [false])
+AC_CHECK_LIB([expect], [exp_expectl], [AM_CONDITIONAL([HAVE_EXPECT], [true])],
+    [AC_MSG_NOTICE([libexpect not found, will not be able to run functional tests])])

 ## Default parameters
 AM_CFLAGS="$AM_CFLAGS -Wall -Wno-deprecated-declarations -std=gnu99 -ggdb3"
 AM_LDFLAGS="$AM_LDFLAGS -export-dynamic"

-AS_IF([test "x$enable_coverage" = xyes],
-    [AM_CFLAGS="$AM_CFLAGS --coverage -O0"
-     AM_LDFLAGS="$AM_LDFLAGS --coverage"
-     AC_MSG_NOTICE([Code coverage analysis enabled])])
-
 AS_IF([test "x$PACKAGE_STATUS" = xdevelopment],
    [AM_CFLAGS="$AM_CFLAGS -Wunused -Werror"])
 AS_IF([test "x$PLATFORM" = xosx],
--- a/prof.supp
+++ b/prof.supp
@@ -8,83 +8,6 @@
 # * python suppressions file from https://github.com/python/cpython/blob/main/Misc/valgrind-python.supp
 #

-# ============================================
-# Functional tests suppressions (stabber/pthread)
-# ============================================
-
-{
-  stabber_pthread_create
-  Memcheck:Leak
-  match-leak-kinds: possible
-  fun:calloc
-  ...
-  fun:allocate_dtv
-  fun:_dl_allocate_tls
-  ...
-  fun:pthread_create*
-  ...
-  fun:server_run
-  ...
-}
-
-{
-  stabber_server_run
-  Memcheck:Leak
-  match-leak-kinds: possible
-  fun:calloc
-  ...
-  fun:pthread_create*
-  ...
-  obj:*/libstabber*
-  ...
-}
-
-{
-  glib_time_zone_cache
-  Memcheck:Leak
-  match-leak-kinds: reachable
-  ...
-  fun:g_time_zone_new*
-  ...
-}
-
-{
-  glib_time_zone_local
-  Memcheck:Leak
-  match-leak-kinds: reachable
-  ...
-  fun:g_strdup
-  ...
-  fun:g_time_zone_new_identifier
-  fun:g_time_zone_new_local
-  ...
-}
-
-{
-  glib_date_time_format
-  Memcheck:Leak
-  match-leak-kinds: reachable
-  ...
-  fun:g_date_time_format
-  ...
-}
-
-{
-  glib_date_time_format_locale
-  Memcheck:Leak
-  match-leak-kinds: reachable
-  fun:*alloc
-  ...
-  obj:*/libglib*
-  ...
-  fun:g_date_time_format
-  ...
-}
-
-# ============================================
-# Original suppressions
-# ============================================
-
 {
  _dl_init
  Memcheck:Leak
@@ -2780,284 +2703,3 @@
   fun:calloc
   fun:_dl_allocate_tls
 }
-
-# pthread TLS allocation in stabber server threads
-{
-   pthread_create_tls_stabber
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:calloc
-   ...
-   fun:allocate_dtv
-   fun:_dl_allocate_tls
-   fun:allocate_stack
-   fun:pthread_create*
-   fun:server_run
-}
-
-# expect/tcl library allocations
-{
-   tcl_alloc_expect
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   ...
-   fun:TclpAlloc
-   fun:Tcl_Alloc
-   ...
-   fun:exp_expectl
-}
-
-{
-   exp_printify
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:malloc
-   ...
-   fun:exp_printify
-   ...
-   fun:exp_expectl
-}
-
-
-# Additional suppressions for functional tests
-
-# libexpect still reachable allocations
-{
-   exp_spawnv_malloc
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   ...
-   fun:exp_spawnv
-   fun:exp_spawnl
-}
-
-{
-   exp_spawnl_realloc
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:realloc
-   ...
-   fun:exp_spawnv
-   fun:exp_spawnl
-}
-
-# libtcl memory pool allocations (expected)
-{
-   tcl_alloc_pool
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   ...
-   fun:TclpAlloc
-   fun:Tcl_Alloc
-}
-
-{
-   tcl_alloc_pool_calloc
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:calloc
-   ...
-   fun:TclpAlloc
-   fun:Tcl_Alloc
-}
-
-# pthread thread-local storage (normal for multi-threaded programs)
-{
-   pthread_tls_allocate_dtv
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:calloc
-   fun:calloc
-   fun:allocate_dtv
-   fun:_dl_allocate_tls
-   fun:allocate_stack
-   fun:pthread_create*
-}
-
-# glib static initializations
-{
-   glib_hash_table_init
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:g_malloc
-   fun:g_hash_table_new_full
-   ...
-   fun:call_init
-   fun:_dl_init
-}
-
-{
-   glib_array_init
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:realloc
-   fun:g_realloc
-   ...
-   fun:call_init
-   fun:_dl_init
-}
-
-# fdopen/fopen allocations (FILE* buffers - normal)
-{
-   fdopen_file_buffer
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   ...
-   fun:fdopen*
-}
-
-{
-   fopen_file_buffer
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   ...
-   fun:fopen*
-}
-
-# stabber log_init (server log file)
-{
-   stabber_log_init
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   ...
-   fun:log_init
-   fun:server_run
-}
-
-# glib time zone (static allocation)
-{
-   g_time_zone_new_local
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   ...
-   fun:g_time_zone_new_local
-}
-
-{
-   g_time_zone_array
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:realloc
-   fun:g_realloc
-   ...
-   fun:g_array_sized_new
-   fun:g_time_zone_new_identifier
-}
-
-# stabber log g_date_time_format invalid read - benign race in logging
-{
-   stabber_g_date_time_format_invalid_read
-   Memcheck:Addr1
-   ...
-   fun:g_date_time_format
-   fun:log_println
-   ...
-}
-
-{
-   stabber_g_date_time_format_invalid_read2
-   Memcheck:Addr2
-   ...
-   fun:g_date_time_format
-   fun:log_println
-   ...
-}
-
-{
-   stabber_g_date_time_format_invalid_read4
-   Memcheck:Addr4
-   ...
-   fun:g_date_time_format
-   fun:log_println
-   ...
-}
-
-{
-   stabber_g_date_time_format_invalid_read8
-   Memcheck:Addr8
-   ...
-   fun:g_date_time_format
-   fun:log_println
-   ...
-}
-
-# More generic suppression for g_date_time_format race condition
-{
-   g_date_time_format_cond
-   Memcheck:Cond
-   ...
-   fun:g_date_time_format
-   ...
-}
-
-{
-   g_date_time_format_value1
-   Memcheck:Value1
-   ...
-   fun:g_date_time_format
-   ...
-}
-
-{
-   g_date_time_format_value2
-   Memcheck:Value2
-   ...
-   fun:g_date_time_format
-   ...
-}
-
-{
-   g_date_time_format_value4
-   Memcheck:Value4
-   ...
-   fun:g_date_time_format
-   ...
-}
-
-{
-   g_date_time_format_value8
-   Memcheck:Value8
-   ...
-   fun:g_date_time_format
-   ...
-}
-
-# Suppress all Addr errors in log_println
-{
-   log_println_addr1
-   Memcheck:Addr1
-   ...
-   fun:log_println
-   ...
-}
-
-{
-   log_println_addr2
-   Memcheck:Addr2
-   ...
-   fun:log_println
-   ...
-}
-
-{
-   log_println_addr4
-   Memcheck:Addr4
-   ...
-   fun:log_println
-   ...
-}
-
-{
-   log_println_addr8
-   Memcheck:Addr8
-   ...
-   fun:log_println
-   ...
-}
--- a/src/command/cmd_defs.c
+++ b/src/command/cmd_defs.c
@@ -139,9 +139,8 @@ static const struct cmd_t command_defs[] = {
              "Show version and license information.")
    },

-    // Max args: account + server <s> + port <p> + tls <t> + auth <a> = 9
    { CMD_PREAMBLE("/connect",
-                   parse_args, 0, 9, NULL)
+                   parse_args, 0, 7, NULL)
      CMD_MAINFUNC(cmd_connect)
      CMD_TAGS(
              CMD_TAG_CONNECTION)
@@ -2825,16 +2824,15 @@ cmd_search_index_any(char* term)
    int terms_len = g_strv_length(processed_terms);

    for (int i = 0; i < terms_len; i++) {
-        GList* index_keys = g_hash_table_get_keys(search_index);
-        GList* curr = index_keys;
-        while (curr) {
-            char* index_entry = g_hash_table_lookup(search_index, curr->data);
+        GHashTableIter iter;
+        gpointer key, value;
+        g_hash_table_iter_init(&iter, search_index);
+        while (g_hash_table_iter_next(&iter, &key, &value)) {
+            char* index_entry = (char*)value;
            if (g_str_match_string(processed_terms[i], index_entry, FALSE)) {
-                results = g_list_append(results, curr->data);
+                results = g_list_append(results, key);
            }
-            curr = g_list_next(curr);
        }
-        g_list_free(index_keys);
    }

    return results;
@@ -2848,13 +2846,14 @@ cmd_search_index_all(char* term)
    auto_gcharv gchar** terms = g_str_tokenize_and_fold(term, NULL, NULL);
    int terms_len = g_strv_length(terms);

-    GList* commands = g_hash_table_get_keys(search_index);
-    GList* curr = commands;
-    while (curr) {
-        char* command = curr->data;
+    GHashTableIter iter;
+    gpointer key, value;
+    g_hash_table_iter_init(&iter, search_index);
+    while (g_hash_table_iter_next(&iter, &key, &value)) {
+        char* command = (char*)key;
+        char* command_index = (char*)value;
        int matches = 0;
        for (int i = 0; i < terms_len; i++) {
-            char* command_index = g_hash_table_lookup(search_index, command);
            if (g_str_match_string(terms[i], command_index, FALSE)) {
                matches++;
            }
@@ -2862,11 +2861,8 @@ cmd_search_index_all(char* term)
        if (matches == terms_len) {
            results = g_list_append(results, command);
        }
-        curr = g_list_next(curr);
    }

-    g_list_free(commands);
-
    return results;
 }

@@ -2989,7 +2985,18 @@ command_docgen(void)
    }

    FILE* toc_fragment = fopen("toc_fragment.html", "w");
+    if (!toc_fragment) {
+        log_error("command_docgen(): unable to open toc_fragment.html for writing: %s", g_strerror(errno));
+        g_list_free(cmds);
+        return;
+    }
    FILE* main_fragment = fopen("main_fragment.html", "w");
+    if (!main_fragment) {
+        log_error("command_docgen(): unable to open main_fragment.html for writing: %s", g_strerror(errno));
+        fclose(toc_fragment);
+        g_list_free(cmds);
+        return;
+    }

    fputs("<ul><li><ul><li>\n", toc_fragment);
    fputs("<hr>\n", main_fragment);
@@ -3094,6 +3101,11 @@ command_mangen(void)
            return;
        }
        FILE* manpage = fopen(filename, "w");
+        if (!manpage) {
+            log_error("command_mangen(): unable to open %s for writing: %s", filename, g_strerror(errno));
+            curr = g_list_next(curr);
+            continue;
+        }

        fprintf(manpage, "%s\n", header);
        fputs(".SH NAME\n", manpage);
--- a/src/command/cmd_funcs.c
+++ b/src/command/cmd_funcs.c
@@ -184,7 +184,7 @@ _string_matches_one_of(const char* what, const char* is, bool is_can_be_null, co
        }
        va_end(ap);
        if (s > 0)
-            cons_show(errmsg);
+            cons_show("%s", errmsg);
    }
    return ret;
 }
@@ -418,7 +418,7 @@ cmd_connect(ProfWin* window, const char* const command, gchar** args)
        auto_char char* err_msg = NULL;
        gboolean res = strtoi_range(port_str, &port, 1, 65535, &err_msg);
        if (!res) {
-            cons_show(err_msg);
+            cons_show("%s", err_msg);
            cons_show("");
            port = 0;
            options_destroy(options);
@@ -711,7 +711,7 @@ _account_set_port(char* account_name, char* port)
    auto_char char* err_msg = NULL;
    gboolean res = strtoi_range(port, &porti, 1, 65535, &err_msg);
    if (!res) {
-        cons_show(err_msg);
+        cons_show("%s", err_msg);
        cons_show("");
    } else {
        accounts_set_port(account_name, porti);
@@ -903,7 +903,7 @@ _account_set_max_sessions(char* account_name, char* max_sessions_raw)
    auto_char char* err_msg = NULL;
    gboolean res = strtoi_range(max_sessions_raw, &max_sessions, 0, INT_MAX, &err_msg);
    if (!res) {
-        cons_show(err_msg);
+        cons_show("%s", err_msg);
        cons_show("");
        return TRUE;
    }
@@ -924,7 +924,7 @@ _account_set_presence_priority(char* account_name, char* presence, char* priorit
    auto_char char* err_msg = NULL;
    gboolean res = strtoi_range(priority, &intval, -128, 127, &err_msg);
    if (!res) {
-        cons_show(err_msg);
+        cons_show("%s", err_msg);
        return TRUE;
    }

@@ -1580,7 +1580,7 @@ _cmd_list_commands(GList* commands)
    while (curr) {
        gchar* cmd = curr->data;
        if (count == 5) {
-            cons_show(cmds->str);
+            cons_show("%s", cmds->str);
            g_string_free(cmds, TRUE);
            cmds = g_string_new("");
            count = 0;
@@ -1589,7 +1589,7 @@ _cmd_list_commands(GList* commands)
        curr = g_list_next(curr);
        count++;
    }
-    cons_show(cmds->str);
+    cons_show("%s", cmds->str);
    g_string_free(cmds, TRUE);
    g_list_free(curr);

@@ -2407,7 +2407,7 @@ cmd_roster(ProfWin* window, const char* const command, gchar** args)
            }
            return TRUE;
        } else {
-            cons_show(err_msg);
+            cons_show("%s", err_msg);
            return TRUE;
        }

@@ -2467,7 +2467,7 @@ cmd_roster(ProfWin* window, const char* const command, gchar** args)
                    cons_show("Roster contact indent set to: %d", intval);
                    rosterwin_roster();
                } else {
-                    cons_show(err_msg);
+                    cons_show("%s", err_msg);
                }
            }
        } else {
@@ -2501,7 +2501,7 @@ cmd_roster(ProfWin* window, const char* const command, gchar** args)
                    cons_show("Roster resource indent set to: %d", intval);
                    rosterwin_roster();
                } else {
-                    cons_show(err_msg);
+                    cons_show("%s", err_msg);
                }
            }
        } else if (g_strcmp0(args[1], "join") == 0) {
@@ -2527,7 +2527,7 @@ cmd_roster(ProfWin* window, const char* const command, gchar** args)
                    cons_show("Roster presence indent set to: %d", intval);
                    rosterwin_roster();
                } else {
-                    cons_show(err_msg);
+                    cons_show("%s", err_msg);
                }
            }
        } else {
@@ -4371,7 +4371,7 @@ cmd_occupants(ProfWin* window, const char* const command, gchar** args)
                wins_resize_all();
                return TRUE;
            } else {
-                cons_show(err_msg);
+                cons_show("%s", err_msg);
                return TRUE;
            }
        }
@@ -4391,7 +4391,7 @@ cmd_occupants(ProfWin* window, const char* const command, gchar** args)

                occupantswin_occupants_all();
            } else {
-                cons_show(err_msg);
+                cons_show("%s", err_msg);
            }
            return TRUE;
        }
@@ -5356,8 +5356,6 @@ cmd_time(ProfWin* window, const char* const command, gchar** args)
            cons_bad_cmd_usage(command);
            return TRUE;
        }
-        if (!set_all)
-            break;
    }
    if (!set_all && n == ARRAY_SIZE(time_prefs)) {
        cons_bad_cmd_usage(command);
@@ -5836,7 +5834,7 @@ cmd_inpblock(ProfWin* window, const char* const command, gchar** args)
            prefs_set_inpblock(intval);
            inp_nonblocking(FALSE);
        } else {
-            cons_show(err_msg);
+            cons_show("%s", err_msg);
        }

        return TRUE;
@@ -6063,7 +6061,7 @@ cmd_statusbar(ProfWin* window, const char* const command, gchar** args)
            ui_resize();
            return TRUE;
        } else {
-            cons_show(err_msg);
+            cons_show("%s", err_msg);
            cons_bad_cmd_usage(command);
            return TRUE;
        }
@@ -6094,7 +6092,7 @@ cmd_statusbar(ProfWin* window, const char* const command, gchar** args)
            ui_resize();
            return TRUE;
        } else {
-            cons_show(err_msg);
+            cons_show("%s", err_msg);
            cons_bad_cmd_usage(command);
            return TRUE;
        }
@@ -6254,7 +6252,7 @@ cmd_log(ProfWin* window, const char* const command, gchar** args)
            prefs_set_max_log_size(intval);
            cons_show("Log maximum size set to %d bytes", intval);
        } else {
-            cons_show(err_msg);
+            cons_show("%s", err_msg);
        }
        return TRUE;
    }
@@ -6304,7 +6302,7 @@ cmd_reconnect(ProfWin* window, const char* const command, gchar** args)
            cons_show("Reconnect interval set to %d seconds.", intval);
        }
    } else {
-        cons_show(err_msg);
+        cons_show("%s", err_msg);
        cons_bad_cmd_usage(command);
    }

@@ -6330,7 +6328,7 @@ cmd_autoping(ProfWin* window, const char* const command, gchar** args)
                cons_show("Autoping interval set to %d seconds.", intval);
            }
        } else {
-            cons_show(err_msg);
+            cons_show("%s", err_msg);
            cons_bad_cmd_usage(command);
        }

@@ -6346,7 +6344,7 @@ cmd_autoping(ProfWin* window, const char* const command, gchar** args)
                cons_show("Autoping timeout set to %d seconds.", intval);
            }
        } else {
-            cons_show(err_msg);
+            cons_show("%s", err_msg);
            cons_bad_cmd_usage(command);
        }

@@ -6416,7 +6414,7 @@ cmd_autoaway(ProfWin* window, const char* const command, gchar** args)
                    cons_show("Auto away time set to: %d minutes.", minutesval);
                }
            } else {
-                cons_show(err_msg);
+                cons_show("%s", err_msg);
            }

            return TRUE;
@@ -6439,7 +6437,7 @@ cmd_autoaway(ProfWin* window, const char* const command, gchar** args)
                    }
                }
            } else {
-                cons_show(err_msg);
+                cons_show("%s", err_msg);
            }

            return TRUE;
@@ -6506,7 +6504,7 @@ cmd_priority(ProfWin* window, const char* const command, gchar** args)
        cl_ev_presence_send(last_presence, 0);
        cons_show("Priority set to %d.", intval);
    } else {
-        cons_show(err_msg);
+        cons_show("%s", err_msg);
    }

    return TRUE;
@@ -6576,7 +6574,7 @@ cmd_tray(ProfWin* window, const char* const command, gchar** args)
                tray_set_timer(intval);
            }
        } else {
-            cons_show(err_msg);
+            cons_show("%s", err_msg);
        }

        return TRUE;
@@ -7181,22 +7179,21 @@ cmd_pgp(ProfWin* window, const char* const command, gchar** args)
        }

        cons_show("PGP keys:");
-        GList* keylist = g_hash_table_get_keys(keys);
-        GList* curr = keylist;
-        while (curr) {
-            ProfPGPKey* key = g_hash_table_lookup(keys, curr->data);
-            cons_show("  %s", key->name);
-            cons_show("    ID          : %s", key->id);
-            auto_char char* format_fp = p_gpg_format_fp_str(key->fp);
+        GHashTableIter iter;
+        gpointer key, value;
+        g_hash_table_iter_init(&iter, keys);
+        while (g_hash_table_iter_next(&iter, &key, &value)) {
+            ProfPGPKey* pgp_key = (ProfPGPKey*)value;
+            cons_show("  %s", pgp_key->name);
+            cons_show("    ID          : %s", pgp_key->id);
+            auto_char char* format_fp = p_gpg_format_fp_str(pgp_key->fp);
            cons_show("    Fingerprint : %s", format_fp);
-            if (key->secret) {
+            if (pgp_key->secret) {
                cons_show("    Type        : PUBLIC, PRIVATE");
            } else {
                cons_show("    Type        : PUBLIC");
            }
-            curr = g_list_next(curr);
        }
-        g_list_free(keylist);
        p_gpg_free_keys(keys);
        return TRUE;
    }
@@ -7237,25 +7234,24 @@ cmd_pgp(ProfWin* window, const char* const command, gchar** args)
            return TRUE;
        }
        GHashTable* pubkeys = p_gpg_pubkeys();
-        GList* jids = g_hash_table_get_keys(pubkeys);
-        if (!jids) {
+        if (!pubkeys || g_hash_table_size(pubkeys) == 0) {
            cons_show("No contacts found with PGP public keys assigned.");
            return TRUE;
        }

        cons_show("Assigned PGP public keys:");
-        GList* curr = jids;
-        while (curr) {
-            char* jid = curr->data;
-            ProfPGPPubKeyId* pubkeyid = g_hash_table_lookup(pubkeys, jid);
+        GHashTableIter iter;
+        gpointer key, value;
+        g_hash_table_iter_init(&iter, pubkeys);
+        while (g_hash_table_iter_next(&iter, &key, &value)) {
+            char* jid = (char*)key;
+            ProfPGPPubKeyId* pubkeyid = (ProfPGPPubKeyId*)value;
            if (pubkeyid->received) {
                cons_show("  %s: %s (received)", jid, pubkeyid->id);
            } else {
                cons_show("  %s: %s (stored)", jid, pubkeyid->id);
            }
-            curr = g_list_next(curr);
        }
-        g_list_free(jids);
        return TRUE;
    }

@@ -7468,22 +7464,21 @@ cmd_ox(ProfWin* window, const char* const command, gchar** args)
        }

        cons_show("OpenPGP keys:");
-        GList* keylist = g_hash_table_get_keys(keys);
-        GList* curr = keylist;
-        while (curr) {
-            ProfPGPKey* key = g_hash_table_lookup(keys, curr->data);
-            cons_show("  %s", key->name);
-            cons_show("    ID          : %s", key->id);
-            auto_char char* format_fp = p_gpg_format_fp_str(key->fp);
+        GHashTableIter iter;
+        gpointer key, value;
+        g_hash_table_iter_init(&iter, keys);
+        while (g_hash_table_iter_next(&iter, &key, &value)) {
+            ProfPGPKey* pgp_key = (ProfPGPKey*)value;
+            cons_show("  %s", pgp_key->name);
+            cons_show("    ID          : %s", pgp_key->id);
+            auto_char char* format_fp = p_gpg_format_fp_str(pgp_key->fp);
            cons_show("    Fingerprint : %s", format_fp);
-            if (key->secret) {
+            if (pgp_key->secret) {
                cons_show("    Type        : PUBLIC, PRIVATE");
            } else {
                cons_show("    Type        : PUBLIC");
            }
-            curr = g_list_next(curr);
        }
-        g_list_free(keylist);
        p_gpg_free_keys(keys);
        return TRUE;
    }
@@ -7491,8 +7486,8 @@ cmd_ox(ProfWin* window, const char* const command, gchar** args)
    else if (g_strcmp0(args[0], "contacts") == 0) {
        GHashTable* keys = ox_gpg_public_keys();
        cons_show("OpenPGP keys:");
-        GList* keylist = g_hash_table_get_keys(keys);
-        GList* curr = keylist;
+        GHashTableIter iter;
+        gpointer key, value;

        GSList* roster_list = NULL;
        jabber_conn_status_t conn_status = connection_get_status();
@@ -7502,15 +7497,16 @@ cmd_ox(ProfWin* window, const char* const command, gchar** args)
            roster_list = roster_get_contacts(ROSTER_ORD_NAME);
        }

-        while (curr) {
-            ProfPGPKey* key = g_hash_table_lookup(keys, curr->data);
+        g_hash_table_iter_init(&iter, keys);
+        while (g_hash_table_iter_next(&iter, &key, &value)) {
+            ProfPGPKey* pgp_key = (ProfPGPKey*)value;
            PContact contact = NULL;
            if (roster_list) {
                GSList* curr_c = roster_list;
                while (!contact && curr_c) {
                    contact = curr_c->data;
                    auto_gchar gchar* xmppuri = g_strdup_printf("xmpp:%s", p_contact_barejid(contact));
-                    if (g_strcmp0(key->name, xmppuri)) {
+                    if (g_strcmp0(pgp_key->name, xmppuri)) {
                        contact = NULL;
                    }
                    curr_c = g_slist_next(curr_c);
@@ -7518,11 +7514,10 @@ cmd_ox(ProfWin* window, const char* const command, gchar** args)
            }

            if (contact) {
-                cons_show("%s - %s", key->fp, key->name);
+                cons_show("%s - %s", pgp_key->fp, pgp_key->name);
            } else {
-                cons_show("%s - %s (not in roster)", key->fp, key->name);
+                cons_show("%s - %s (not in roster)", pgp_key->fp, pgp_key->name);
            }
-            curr = g_list_next(curr);
        }

    } else if (g_strcmp0(args[0], "start") == 0) {
@@ -9612,7 +9607,7 @@ cmd_register(ProfWin* window, const char* const command, gchar** args)
        auto_char char* err_msg = NULL;
        gboolean res = strtoi_range(port_str, &port, 1, 65535, &err_msg);
        if (!res) {
-            cons_show(err_msg);
+            cons_show("%s", err_msg);
            cons_show("");
            port = 0;
            options_destroy(options);
@@ -9682,7 +9677,7 @@ cmd_strophe(ProfWin* window, const char* const command, gchar** args)
            prefs_set_string(PREF_STROPHE_VERBOSITY, args[1]);
            return TRUE;
        } else {
-            cons_show(err_msg);
+            cons_show("%s", err_msg);
        }
    } else if (g_strcmp0(args[0], "sm") == 0) {
        if (g_strcmp0(args[1], "no-resend") == 0) {
--- a/src/database.c
+++ b/src/database.c
@@ -65,6 +65,36 @@ static gboolean _check_available_space_for_db_migration(char* path_to_db);

 static const int latest_version = 2;

+// Helper: close DB handle (if any), warn on busy, and shutdown SQLite
+static void
+_db_teardown(const char* ctx)
+{
+    if (g_chatlog_database) {
+        int rc = sqlite3_close_v2(g_chatlog_database);
+        if (rc != SQLITE_OK) {
+            log_warning("sqlite3_close_v2 in %s returned %d; database may still have active statements.",
+                        ctx ? ctx : "db_teardown", rc);
+        }
+        g_chatlog_database = NULL;
+    }
+    sqlite3_shutdown();
+}
+
+// Helper: prepare a statement and log a contextual error on failure
+static gboolean
+_db_prepare_ctx(const char* query, sqlite3_stmt** stmt, const char* ctx)
+{
+    int rc = sqlite3_prepare_v2(g_chatlog_database, query, -1, stmt, NULL);
+    if (rc != SQLITE_OK) {
+        log_error("SQLite error in %s: (error code: %d) %s",
+                  ctx ? ctx : "sqlite3_prepare_v2",
+                  rc,
+                  sqlite3_errmsg(g_chatlog_database));
+        return FALSE;
+    }
+    return TRUE;
+}
+
 static char*
 _db_strdup(const char* str)
 {
@@ -98,17 +128,19 @@ log_database_init(ProfAccount* account)

    auto_char char* filename = _get_db_filename(account);
    if (!filename) {
+        sqlite3_shutdown();
        return FALSE;
    }

    ret = sqlite3_open(filename, &g_chatlog_database);
    if (ret != SQLITE_OK) {
-        const char* err_msg = sqlite3_errmsg(g_chatlog_database);
+        const char* err_msg = g_chatlog_database ? sqlite3_errmsg(g_chatlog_database) : "(no handle)";
        log_error("Error opening SQLite database: %s", err_msg);
+        _db_teardown("log_database_init(open)");
        return FALSE;
    }

-    char* err_msg;
+    char* err_msg = NULL;

    int db_version = _get_db_version();
    if (db_version == latest_version) {
@@ -216,6 +248,7 @@ out:
    } else {
        log_error("Unknown SQLite error in log_database_init().");
    }
+    _db_teardown("log_database_init(out)");
    return FALSE;
 }

@@ -223,11 +256,7 @@ void
 log_database_close(void)
 {
    log_debug("log_database_close() called");
-    if (g_chatlog_database) {
-        sqlite3_close(g_chatlog_database);
-        sqlite3_shutdown();
-        g_chatlog_database = NULL;
-    }
+    _db_teardown("log_database_close");
 }

 void
@@ -281,8 +310,15 @@ log_database_get_limits_info(const gchar* const contact_barejid, gboolean is_las
 {
    sqlite3_stmt* stmt = NULL;
    const Jid* myjid = connection_get_jid();
-    if (!myjid->str)
-        return NULL;
+    // Always return a valid ProfMessage to avoid NULL dereferences in callers
+    ProfMessage* msg = message_init();
+    if (!myjid || !myjid->str) {
+        // If caller requested the last message and we have no context, fall back to now
+        if (is_last) {
+            msg->timestamp = g_date_time_new_now_utc();
+        }
+        return msg;
+    }

    const char* order = is_last ? "DESC" : "ASC";
    auto_sqlite char* query = sqlite3_mprintf("SELECT `archive_id`, `timestamp` FROM `ChatLogs` WHERE "
@@ -293,17 +329,19 @@ log_database_get_limits_info(const gchar* const contact_barejid, gboolean is_las

    if (!query) {
        log_error("Could not allocate memory for SQL query in log_database_get_limits_info()");
-        return NULL;
+        if (is_last) {
+            msg->timestamp = g_date_time_new_now_utc();
+        }
+        return msg;
    }

-    int rc = sqlite3_prepare_v2(g_chatlog_database, query, -1, &stmt, NULL);
-    if (rc != SQLITE_OK) {
-        log_error("Unknown SQLite error in log_database_get_last_info().");
-        return NULL;
+    if (!_db_prepare_ctx(query, &stmt, "log_database_get_limits_info()")) {
+        if (is_last) {
+            msg->timestamp = g_date_time_new_now_utc();
+        }
+        return msg;
    }

-    ProfMessage* msg = message_init();
-
    if (sqlite3_step(stmt) == SQLITE_ROW) {
        char* archive_id = (char*)sqlite3_column_text(stmt, 0);
        char* date = (char*)sqlite3_column_text(stmt, 1);
@@ -313,6 +351,11 @@ log_database_get_limits_info(const gchar* const contact_barejid, gboolean is_las
    }
    sqlite3_finalize(stmt);

+    // If nothing was found and caller expects the last message, provide a sane default
+    if (!msg->timestamp && is_last) {
+        msg->timestamp = g_date_time_new_now_utc();
+    }
+
    return msg;
 }

@@ -357,9 +400,7 @@ log_database_get_previous_chat(const gchar* const contact_barejid, const gchar*
        return DB_RESPONSE_ERROR;
    }

-    int rc = sqlite3_prepare_v2(g_chatlog_database, query, -1, &stmt, NULL);
-    if (rc != SQLITE_OK) {
-        log_error("SQLite error in log_database_get_previous_chat(): (error code: %d) %s", rc, sqlite3_errmsg(g_chatlog_database));
+    if (!_db_prepare_ctx(query, &stmt, "log_database_get_previous_chat()")) {
        return DB_RESPONSE_ERROR;
    }

@@ -503,9 +544,7 @@ _add_to_db(ProfMessage* message, char* type, const Jid* const from_jid, const Ji
        }

        sqlite3_stmt* lmc_stmt = NULL;
-
-        if (SQLITE_OK != sqlite3_prepare_v2(g_chatlog_database, replace_check_query, -1, &lmc_stmt, NULL)) {
-            log_error("SQLite error in _add_to_db() on selecting original message: %s", sqlite3_errmsg(g_chatlog_database));
+        if (!_db_prepare_ctx(replace_check_query, &lmc_stmt, "_add_to_db(replace_check)")) {
            return;
        }

@@ -542,8 +581,7 @@ _add_to_db(ProfMessage* message, char* type, const Jid* const from_jid, const Ji
        }

        sqlite3_stmt* stmt;
-
-        if (SQLITE_OK == sqlite3_prepare_v2(g_chatlog_database, duplicate_check_query, -1, &stmt, NULL)) {
+        if (_db_prepare_ctx(duplicate_check_query, &stmt, "_add_to_db(duplicate_check)")) {
            if (sqlite3_step(stmt) == SQLITE_ROW) {
                log_error("Duplicate stanza-id found for the message. stanza_id: %s; archive_id: %s; sender: %s; content: %s", message->id, message->stanzaid, from_jid->barejid, message->plain);
                cons_show_error("Got a message with duplicate (server-generated) stanza-id from %s.", from_jid->fulljid);
@@ -599,8 +637,7 @@ _get_db_version(void)
    int current_version = -1;
    const char* query = "SELECT `version` FROM `DbVersion` LIMIT 1";
    sqlite3_stmt* statement;
-
-    if (sqlite3_prepare_v2(g_chatlog_database, query, -1, &statement, NULL) == SQLITE_OK) {
+    if (_db_prepare_ctx(query, &statement, "_get_db_version()")) {
        if (sqlite3_step(statement) == SQLITE_ROW) {
            current_version = sqlite3_column_int(statement, 0);
        }
--- a/src/omemo/omemo.c
+++ b/src/omemo/omemo.c
@@ -532,11 +532,13 @@ omemo_set_device_list(const char* const from, GList* device_list)
                for (device_id = device_list; device_id != NULL; device_id = device_id->next) {
                    GHashTable* known_identities = g_hash_table_lookup(omemo_ctx.known_devices, jid->barejid);
                    if (known_identities) {
-                        GList* fp = NULL;
-                        for (fp = g_hash_table_get_keys(known_identities); fp != NULL; fp = fp->next) {
-                            if (device_id->data == g_hash_table_lookup(known_identities, fp->data)) {
-                                cons_show("OMEMO: Adding firstusage trust for %s device %d - Fingerprint %s", jid->barejid, device_id->data, omemo_format_fingerprint(fp->data));
-                                omemo_trust(jid->barejid, omemo_format_fingerprint(fp->data));
+                        GHashTableIter iter;
+                        gpointer key, value;
+                        g_hash_table_iter_init(&iter, known_identities);
+                        while (g_hash_table_iter_next(&iter, &key, &value)) {
+                            if (device_id->data == value) {
+                                cons_show("OMEMO: Adding firstusage trust for %s device %d - Fingerprint %s", jid->barejid, device_id->data, omemo_format_fingerprint(key));
+                                omemo_trust(jid->barejid, omemo_format_fingerprint(key));
                            }
                        }
                    }
--- a/src/pgp/gpg.c
+++ b/src/pgp/gpg.c
@@ -345,14 +345,13 @@ p_gpg_list_keys(void)

    // TODO: move autocomplete in other place
    autocomplete_clear(key_ac);
-    GList* ids = g_hash_table_get_keys(result);
-    GList* curr = ids;
-    while (curr) {
-        ProfPGPKey* key = g_hash_table_lookup(result, curr->data);
-        autocomplete_add(key_ac, key->id);
-        curr = curr->next;
+    GHashTableIter iter;
+    gpointer key, value;
+    g_hash_table_iter_init(&iter, result);
+    while (g_hash_table_iter_next(&iter, &key, &value)) {
+        ProfPGPKey* pgp_key = (ProfPGPKey*)value;
+        autocomplete_add(key_ac, pgp_key->id);
    }
-    g_list_free(ids);

    return result;
 }
--- a/src/plugins/api.c
+++ b/src/plugins/api.c
@@ -54,7 +54,6 @@
 #include "plugins/settings.h"
 #include "plugins/disco.h"
 #include "ui/ui.h"
-#include "ui/win_types.h"
 #include "ui/window_list.h"
 #include "xmpp/roster_list.h"

@@ -206,13 +205,6 @@ api_get_current_recipient(void)
    }
 }

-gchar*
-api_get_current_window(void)
-{
-    ProfWin* current = wins_get_current();
-    return win_get_title(current);
-}
-
 char*
 api_get_current_muc(void)
 {
--- a/src/plugins/api.h
+++ b/src/plugins/api.h
@@ -46,7 +46,6 @@ void api_notify(const char* message, const char* category, int timeout_ms);
 void api_send_line(char* line);

 char* api_get_current_recipient(void);
-gchar* api_get_current_window(void);
 char* api_get_current_muc(void);
 gboolean api_current_win_is_console(void);
 char* api_get_current_nick(void);
--- a/src/plugins/autocompleters.c
+++ b/src/plugins/autocompleters.c
@@ -141,18 +141,16 @@ autocompleters_complete(const char* const input, gboolean previous)
    while (curr_hash) {
        GHashTable* key_to_ac = curr_hash->data;

-        GList* keys = g_hash_table_get_keys(key_to_ac);
-        GList* curr = keys;
-        while (curr) {
-            result = autocomplete_param_with_ac(input, curr->data, g_hash_table_lookup(key_to_ac, curr->data), TRUE, previous);
+        GHashTableIter iter;
+        gpointer key, value;
+        g_hash_table_iter_init(&iter, key_to_ac);
+        while (g_hash_table_iter_next(&iter, &key, &value)) {
+            result = autocomplete_param_with_ac(input, key, value, TRUE, previous);
            if (result) {
                g_list_free(ac_hashes);
-                g_list_free(keys);
                return result;
            }
-            curr = g_list_next(curr);
        }
-        g_list_free(keys);

        curr_hash = g_list_next(curr_hash);
    }
@@ -162,22 +160,19 @@ autocompleters_complete(const char* const input, gboolean previous)
    curr_hash = filepath_hashes;
    while (curr_hash) {
        GHashTable* prefixes_hash = curr_hash->data;
-        GList* prefixes = g_hash_table_get_keys(prefixes_hash);
-        GList* curr_prefix = prefixes;
-        while (curr_prefix) {
-            char* prefix = curr_prefix->data;
+        GHashTableIter iter;
+        gpointer key, value;
+        g_hash_table_iter_init(&iter, prefixes_hash);
+        while (g_hash_table_iter_next(&iter, &key, &value)) {
+            char* prefix = (char*)key;
            if (g_str_has_prefix(input, prefix)) {
                result = cmd_ac_complete_filepath(input, prefix, previous);
                if (result) {
                    g_list_free(filepath_hashes);
-                    g_list_free(prefixes);
                    return result;
                }
            }
-
-            curr_prefix = g_list_next(curr_prefix);
        }
-        g_list_free(prefixes);

        curr_hash = g_list_next(curr_hash);
    }
--- a/src/plugins/c_api.c
+++ b/src/plugins/c_api.c
@@ -165,12 +165,6 @@ c_api_get_current_recipient(void)
    return api_get_current_recipient();
 }

-static char*
-c_api_get_current_window(void)
-{
-    return api_get_current_window();
-}
-
 static char*
 c_api_get_current_muc(void)
 {
@@ -483,7 +477,6 @@ c_api_init(void)
    prof_notify = c_api_notify;
    prof_send_line = c_api_send_line;
    prof_get_current_recipient = c_api_get_current_recipient;
-    prof_get_current_window = c_api_get_current_window;
    prof_get_current_muc = c_api_get_current_muc;
    prof_current_win_is_console = c_api_current_win_is_console;
    prof_get_current_nick = c_api_get_current_nick;
--- a/src/plugins/callbacks.c
+++ b/src/plugins/callbacks.c
@@ -149,15 +149,14 @@ callbacks_remove(const char* const plugin_name)
 {
    GHashTable* command_hash = g_hash_table_lookup(p_commands, plugin_name);
    if (command_hash) {
-        GList* commands = g_hash_table_get_keys(command_hash);
-        GList* curr = commands;
-        while (curr) {
-            char* command = curr->data;
+        GHashTableIter iter;
+        gpointer key, value;
+        g_hash_table_iter_init(&iter, command_hash);
+        while (g_hash_table_iter_next(&iter, &key, &value)) {
+            char* command = (char*)key;
            cmd_ac_remove(command);
            cmd_ac_remove_help(&command[1]);
-            curr = g_list_next(curr);
        }
-        g_list_free(commands);
    }

    g_hash_table_remove(p_commands, plugin_name);
@@ -165,13 +164,12 @@ callbacks_remove(const char* const plugin_name)

    GHashTable* tag_to_win_cb_hash = g_hash_table_lookup(p_window_callbacks, plugin_name);
    if (tag_to_win_cb_hash) {
-        GList* tags = g_hash_table_get_keys(tag_to_win_cb_hash);
-        GList* curr = tags;
-        while (curr) {
-            wins_close_plugin(curr->data);
-            curr = g_list_next(curr);
+        GHashTableIter iter;
+        gpointer key, value;
+        g_hash_table_iter_init(&iter, tag_to_win_cb_hash);
+        while (g_hash_table_iter_next(&iter, &key, &value)) {
+            wins_close_plugin(key);
        }
-        g_list_free(tags);
    }

    g_hash_table_remove(p_window_callbacks, plugin_name);
--- a/src/plugins/disco.c
+++ b/src/plugins/disco.c
@@ -107,10 +107,11 @@ disco_remove_features(const char* plugin_name)
        return;
    }

-    GList* plugin_feature_list = g_hash_table_get_keys(plugin_features_set);
-    GList* curr = plugin_feature_list;
-    while (curr) {
-        char* feature = curr->data;
+    GHashTableIter iter;
+    gpointer key, value;
+    g_hash_table_iter_init(&iter, plugin_features_set);
+    while (g_hash_table_iter_next(&iter, &key, &value)) {
+        char* feature = (char*)key;
        if (g_hash_table_contains(features, feature)) {
            void* refcountp = g_hash_table_lookup(features, feature);
            int refcount = GPOINTER_TO_INT(refcountp);
@@ -121,10 +122,7 @@ disco_remove_features(const char* plugin_name)
                g_hash_table_replace(features, strdup(feature), GINT_TO_POINTER(refcount));
            }
        }
-
-        curr = g_list_next(curr);
    }
-    g_list_free(plugin_feature_list);
 }

 GList*
--- a/src/plugins/profapi.c
+++ b/src/plugins/profapi.c
@@ -62,7 +62,6 @@ void (*prof_notify)(const char* message, int timeout_ms, const char* category) =
 void (*prof_send_line)(char* line) = NULL;

 char* (*prof_get_current_recipient)(void) = NULL;
-char* (*prof_get_current_window)(void) = NULL;
 char* (*prof_get_current_muc)(void) = NULL;
 int (*prof_current_win_is_console)(void) = NULL;
 char* (*prof_get_current_nick)(void) = NULL;
--- a/src/plugins/profapi.h
+++ b/src/plugins/profapi.h
@@ -71,7 +71,6 @@ void (*prof_notify)(const char* message, int timeout_ms, const char* category);
 void (*prof_send_line)(char* line);

 char* (*prof_get_current_recipient)(void);
-char* (*prof_get_current_window)(void);
 char* (*prof_get_current_muc)(void);
 int (*prof_current_win_is_console)(void);
 char* (*prof_get_current_nick)(void);
--- a/src/plugins/python_api.c
+++ b/src/plugins/python_api.c
@@ -415,15 +415,6 @@ python_api_get_current_recipient(PyObject* self, PyObject* args)
    }
 }

-static PyObject*
-python_api_get_current_window(PyObject* self, PyObject* args)
-{
-    allow_python_threads();
-    auto_gchar gchar* recipient = api_get_current_window();
-    disable_python_threads();
-    return Py_BuildValue("s", recipient);
-}
-
 static PyObject*
 python_api_get_current_muc(PyObject* self, PyObject* args)
 {
@@ -1539,7 +1530,6 @@ static PyMethodDef apiMethods[] = {
    { "send_line", python_api_send_line, METH_VARARGS, "Send a line of input." },
    { "notify", python_api_notify, METH_VARARGS, "Send desktop notification." },
    { "get_current_recipient", python_api_get_current_recipient, METH_VARARGS, "Return the jid of the recipient of the current window." },
-    { "get_current_window", python_api_get_current_window, METH_VARARGS, "Return title of the current window." },
    { "get_current_muc", python_api_get_current_muc, METH_VARARGS, "Return the jid of the room of the current window." },
    { "get_current_nick", python_api_get_current_nick, METH_VARARGS, "Return nickname in current room." },
    { "get_name_from_roster", python_api_get_name_from_roster, METH_VARARGS, "Return nickname in roster of barejid." },
--- a/src/ui/buffer.c
+++ b/src/ui/buffer.c
@@ -140,6 +140,10 @@ void
 buffer_remove_entry(ProfBuff buffer, int entry)
 {
    GSList* node = g_slist_nth(buffer->entries, entry);
+    if (node == NULL) {
+        // Index out of range; nothing to remove
+        return;
+    }
    ProfBuffEntry* e = node->data;
    buffer->lines -= e->_lines;
    _free_entry(e);
@@ -168,6 +172,9 @@ ProfBuffEntry*
 buffer_get_entry(ProfBuff buffer, int entry)
 {
    GSList* node = g_slist_nth(buffer->entries, entry);
+    if (node == NULL) {
+        return NULL;
+    }
    return node->data;
 }

@@ -189,6 +196,7 @@ buffer_get_entry_by_id(ProfBuff buffer, const char* const id)
 static ProfBuffEntry*
 _create_entry(const char* show_char, int pad_indent, GDateTime* time, int flags, theme_item_t theme_item, const char* const display_from, const char* const from_jid, const char* const message, DeliveryReceipt* receipt, const char* const id, int y_start_pos, int y_end_pos)
 {
+    assert(time != NULL);
    ProfBuffEntry* e = malloc(sizeof(struct prof_buff_entry_t));
    e->show_char = STRDUP_OR_NULL(show_char);
    e->pad_indent = pad_indent;
--- a/src/ui/chatwin.c
+++ b/src/ui/chatwin.c
@@ -592,8 +592,11 @@ chatwin_db_history(ProfChatWin* chatwin, const gchar* start_time, const gchar* e
 {
    auto_gchar gchar* _end_time = NULL;
    if (!end_time && buffer_size(((ProfWin*)chatwin)->layout->buffer) > 0) {
-        _end_time = g_date_time_format_iso8601(buffer_get_entry(((ProfWin*)chatwin)->layout->buffer, 0)->time);
-        end_time = _end_time;
+        ProfBuffEntry* first = buffer_get_entry(((ProfWin*)chatwin)->layout->buffer, 0);
+        if (first && first->time) {
+            _end_time = g_date_time_format_iso8601(first->time);
+            end_time = _end_time;
+        }
    }

    GSList* history = NULL;
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -152,7 +152,7 @@ cons_bad_cmd_usage(const char* const cmd)
    g_string_printf(msg, "Invalid usage, see '/help %s' for details.", &cmd[1]);

    cons_show("");
-    cons_show(msg->str);
+    cons_show("%s", msg->str);

    g_string_free(msg, TRUE);
 }
@@ -773,7 +773,7 @@ cons_show_disco_info(const char* jid, GSList* identities, GSList* features)
            if (identity->category) {
                identity_str = g_string_append(identity_str, identity->category);
            }
-            cons_show(identity_str->str);
+            cons_show("%s", identity_str->str);
            g_string_free(identity_str, TRUE);
            identities = g_slist_next(identities);
        }
@@ -1019,7 +1019,7 @@ cons_show_account(ProfAccount* account)
            }
            curr = curr->next;
        }
-        cons_show(manual->str);
+        cons_show("%s", manual->str);
        g_string_free(manual, TRUE);
    }
    if (g_list_length(account->otr_opportunistic) > 0) {
@@ -1032,7 +1032,7 @@ cons_show_account(ProfAccount* account)
            }
            curr = curr->next;
        }
-        cons_show(opportunistic->str);
+        cons_show("%s", opportunistic->str);
        g_string_free(opportunistic, TRUE);
    }
    if (g_list_length(account->otr_always) > 0) {
@@ -1045,7 +1045,7 @@ cons_show_account(ProfAccount* account)
            }
            curr = curr->next;
        }
-        cons_show(always->str);
+        cons_show("%s", always->str);
        g_string_free(always, TRUE);
    }

@@ -2297,7 +2297,7 @@ cons_show_themes(GSList* themes)
    } else {
        cons_show("Available themes:");
        while (themes) {
-            cons_show(themes->data);
+            cons_show("%s", themes->data);
            themes = g_slist_next(themes);
        }
    }
@@ -2315,7 +2315,7 @@ cons_show_scripts(GSList* scripts)
    } else {
        cons_show("Scripts:");
        while (scripts) {
-            cons_show(scripts->data);
+            cons_show("%s", scripts->data);
            scripts = g_slist_next(scripts);
        }
    }
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -461,7 +461,7 @@ ui_invalid_command_usage(const char* const cmd, void (*setting_func)(void))
        (*setting_func)();
    } else {
        cons_show("");
-        cons_show(msg->str);
+        cons_show("%s", msg->str);
        ProfWin* current = wins_get_current();
        if (current->type == WIN_CHAT) {
            win_println(current, THEME_DEFAULT, "-", "%s", msg->str);
--- a/src/ui/inputwin.c
+++ b/src/ui/inputwin.c
@@ -144,10 +144,13 @@ void
 create_input_window(void)
 {
    /* MB_CUR_MAX is evaluated at runtime depending on the current
-     * locale, therefore we check that our own version is big enough
-     * and bail out if it isn't.
+     * locale; ensure our own compiled-in maximum is sufficient.
+     * Fail gracefully instead of aborting in production.
     */
-    assert(MB_CUR_MAX <= PROF_MB_CUR_MAX);
+    if (MB_CUR_MAX > PROF_MB_CUR_MAX) {
+        cons_show_error("Your locale's MB_CUR_MAX (%zu) exceeds PROF_MB_CUR_MAX (%d); input window disabled.", (size_t)MB_CUR_MAX, PROF_MB_CUR_MAX);
+        return;
+    }
 #ifdef NCURSES_REENTRANT
    set_escdelay(25);
 #else
@@ -163,6 +166,10 @@ create_input_window(void)
    rl_callback_handler_install(NULL, _inp_rl_linehandler);

    inp_win = newpad(1, INP_WIN_MAX);
+    if (!inp_win) {
+        // Failed to allocate input pad; leave inp_win NULL and avoid further use
+        return;
+    }
    wbkgd(inp_win, theme_attrs(THEME_INPUT_TEXT));
    keypad(inp_win, TRUE);
    wmove(inp_win, 0, 0);
@@ -238,6 +245,9 @@ inp_readline(void)
 void
 inp_win_resize(void)
 {
+    if (!inp_win) {
+        return;
+    }
    int col = getcurx(inp_win);
    int wcols = getmaxx(stdscr);

@@ -285,8 +295,10 @@ void
 inp_close(void)
 {
    rl_callback_handler_remove();
-    delwin(inp_win);
-    inp_win = NULL;
+    if (inp_win) {
+        delwin(inp_win);
+        inp_win = NULL;
+    }
    fclose(discard);
    discard = NULL;
 }
@@ -294,6 +306,9 @@ inp_close(void)
 char*
 inp_get_line(void)
 {
+    if (!inp_win) {
+        return NULL;
+    }
    werase(inp_win);
    wmove(inp_win, 0, 0);
    _inp_win_update_virtual();
@@ -318,6 +333,9 @@ inp_set_line(const char* const new_line)
 char*
 inp_get_password(void)
 {
+    if (!inp_win) {
+        return NULL;
+    }
    werase(inp_win);
    wmove(inp_win, 0, 0);
    _inp_win_update_virtual();
--- a/src/ui/statusbar.c
+++ b/src/ui/statusbar.c
@@ -111,16 +111,23 @@ status_bar_init(void)

    int row = screen_statusbar_row();
    int cols = getmaxx(stdscr);
+    if (cols <= 0) {
+        cols = 1;
+    }
    statusbar_win = newwin(1, cols, row, 0);

-    status_bar_draw();
+    if (statusbar_win) {
+        status_bar_draw();
+    }
 }

 void
 status_bar_close(void)
 {
-    delwin(statusbar_win);
-    statusbar_win = NULL;
+    if (statusbar_win) {
+        delwin(statusbar_win);
+        statusbar_win = NULL;
+    }
    if (statusbar) {
        if (statusbar->time) {
            g_free(statusbar->time);
@@ -145,7 +152,13 @@ status_bar_close(void)
 void
 status_bar_resize(void)
 {
+    if (!statusbar_win) {
+        return;
+    }
    int cols = getmaxx(stdscr);
+    if (cols <= 0) {
+        cols = 1;
+    }
    werase(statusbar_win);
    int row = screen_statusbar_row();
    wresize(statusbar_win, 1, cols);
@@ -285,6 +298,9 @@ status_bar_clear_fulljid(void)
 void
 status_bar_draw(void)
 {
+    if (!statusbar_win) {
+        return;
+    }
    werase(statusbar_win);
    wbkgd(statusbar_win, theme_attrs(THEME_STATUS_TEXT));

@@ -674,8 +690,13 @@ _display_name(StatusBarTab* tab)
        fullname = g_strconcat(mucwin_title, " conf", NULL);
    } else if (tab->window_type == WIN_PRIVATE) {
        auto_jid Jid* jid = jid_create(tab->identifier);
-        auto_gchar gchar* mucwin_title = mucwin_generate_title(jid->barejid, PREF_STATUSBAR_ROOM_TITLE);
-        fullname = g_strconcat(mucwin_title, "/", jid->resourcepart, NULL);
+        if (jid) {
+            auto_gchar gchar* mucwin_title = mucwin_generate_title(jid->barejid, PREF_STATUSBAR_ROOM_TITLE);
+            fullname = g_strconcat(mucwin_title, "/", jid->resourcepart, NULL);
+        } else {
+            // Fallback: use identifier directly if JID parsing failed
+            fullname = strdup(tab->identifier);
+        }
    } else {
        fullname = strdup("window");
    }
--- a/src/ui/titlebar.c
+++ b/src/ui/titlebar.c
@@ -73,9 +73,16 @@ void
 create_title_bar(void)
 {
    int cols = getmaxx(stdscr);
+    if (cols <= 0) {
+        cols = 1;
+    }

    int row = screen_titlebar_row();
    win = newwin(1, cols, row, 0);
+    if (!win) {
+        // Failed to create title bar window; skip initialization to avoid NULL deref
+        return;
+    }
    wbkgd(win, theme_attrs(THEME_TITLE_TEXT));
    title_bar_console();
    title_bar_set_presence(CONTACT_OFFLINE);
@@ -88,13 +95,18 @@ create_title_bar(void)
 void
 free_title_bar(void)
 {
-    delwin(win);
-    win = NULL;
+    if (win) {
+        delwin(win);
+        win = NULL;
+    }
 }

 void
 title_bar_update_virtual(void)
 {
+    if (!win) {
+        return;
+    }
    ProfWin* window = wins_get_current();
    if (window->type != WIN_CONSOLE) {
        if (typing_elapsed) {
@@ -114,7 +126,13 @@ title_bar_update_virtual(void)
 void
 title_bar_resize(void)
 {
+    if (!win) {
+        return;
+    }
    int cols = getmaxx(stdscr);
+    if (cols <= 0) {
+        cols = 1;
+    }

    werase(win);

@@ -131,6 +149,9 @@ title_bar_resize(void)
 void
 title_bar_console(void)
 {
+    if (!win) {
+        return;
+    }
    werase(win);
    if (typing_elapsed) {
        g_timer_destroy(typing_elapsed);
@@ -192,6 +213,9 @@ title_bar_set_typing(gboolean is_typing)
 static void
 _title_bar_draw(void)
 {
+    if (!win) {
+        return;
+    }
    int pos;
    int maxrightpos;
    ProfWin* current = wins_get_current();
@@ -268,11 +292,7 @@ _show_scrolled(ProfWin* current)
        wattroff(win, bracket_attrs);

        wattron(win, scrolled_attrs);
-        if (current->layout->unread_msg == 0) {
-            wprintw(win, "SCROLLED");
-        } else {
-            wprintw(win, "SCROLLED, NEW MESSAGES");
-        }
+        wprintw(win, "SCROLLED");
        wattroff(win, scrolled_attrs);

        wattron(win, bracket_attrs);
--- a/src/ui/win_types.h
+++ b/src/ui/win_types.h
@@ -120,7 +120,6 @@ typedef struct prof_layout_t
    ProfBuff buffer;
    int y_pos;
    int paged;
-    int unread_msg;
 } ProfLayout;

 typedef struct prof_layout_simple_t
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -75,12 +75,30 @@ static void _win_print_internal(ProfWin* window, const char* show_char, int pad_
                                int flags, theme_item_t theme_item, const char* const from, const char* const message, DeliveryReceipt* receipt);
 static void _win_print_wrapped(WINDOW* win, const char* const message, size_t indent, int pad_indent);

+// Helper: clamp a subwindow width to a sane range [1, cols-1] if possible
+static int
+_check_subwin_width(int cols, int width)
+{
+    if (cols > 1) {
+        if (width < 1)
+            width = 1;
+        if (width >= cols)
+            width = cols - 1;
+    } else {
+        width = 1;
+    }
+    return width;
+}
+
 int
 win_roster_cols(void)
 {
    int roster_win_percent = prefs_get_roster_size();
    int cols = getmaxx(stdscr);
-    return CEILING((((double)cols) / 100) * roster_win_percent);
+    int width = CEILING((((double)cols) / 100) * roster_win_percent);
+    // Clamp to a sane range to avoid zero/full-width pads
+    width = _check_subwin_width(cols, width);
+    return width;
 }

 int
@@ -88,7 +106,10 @@ win_occpuants_cols(void)
 {
    int occupants_win_percent = prefs_get_occupants_size();
    int cols = getmaxx(stdscr);
-    return CEILING((((double)cols) / 100) * occupants_win_percent);
+    int width = CEILING((((double)cols) / 100) * occupants_win_percent);
+    // Clamp to a sane range to avoid zero/full-width pads
+    width = _check_subwin_width(cols, width);
+    return width;
 }

 static ProfLayout*
@@ -103,7 +124,6 @@ _win_create_simple_layout(void)
    layout->base.buffer = buffer_create();
    layout->base.y_pos = 0;
    layout->base.paged = 0;
-    layout->base.unread_msg = 0;
    scrollok(layout->base.win, TRUE);

    return &layout->base;
@@ -121,7 +141,6 @@ _win_create_split_layout(void)
    layout->base.buffer = buffer_create();
    layout->base.y_pos = 0;
    layout->base.paged = 0;
-    layout->base.unread_msg = 0;
    scrollok(layout->base.win, TRUE);
    layout->subwin = NULL;
    layout->sub_y_pos = 0;
@@ -144,6 +163,7 @@ win_create_console(void)
 ProfWin*
 win_create_chat(const char* const barejid)
 {
+    assert(barejid != NULL);
    ProfChatWin* new_win = malloc(sizeof(ProfChatWin));
    new_win->window.type = WIN_CHAT;
    new_win->window.scroll_state = WIN_SCROLL_INNER;
@@ -175,6 +195,7 @@ win_create_chat(const char* const barejid)
 ProfWin*
 win_create_muc(const char* const roomjid)
 {
+    assert(roomjid != NULL);
    ProfMucWin* new_win = malloc(sizeof(ProfMucWin));
    int cols = getmaxx(stdscr);

@@ -199,7 +220,6 @@ win_create_muc(const char* const roomjid)
    layout->base.buffer = buffer_create();
    layout->base.y_pos = 0;
    layout->base.paged = 0;
-    layout->base.unread_msg = 0;
    scrollok(layout->base.win, TRUE);
    new_win->window.layout = (ProfLayout*)layout;

@@ -233,6 +253,8 @@ win_create_muc(const char* const roomjid)
 ProfWin*
 win_create_config(const char* const roomjid, DataForm* form, ProfConfWinCallback submit, ProfConfWinCallback cancel, const void* userdata)
 {
+    assert(roomjid != NULL);
+    assert(form != NULL);
    ProfConfWin* new_win = malloc(sizeof(ProfConfWin));
    new_win->window.type = WIN_CONFIG;
    new_win->window.scroll_state = WIN_SCROLL_INNER;
@@ -251,6 +273,7 @@ win_create_config(const char* const roomjid, DataForm* form, ProfConfWinCallback
 ProfWin*
 win_create_private(const char* const fulljid)
 {
+    assert(fulljid != NULL);
    ProfPrivateWin* new_win = malloc(sizeof(ProfPrivateWin));
    new_win->window.type = WIN_PRIVATE;
    new_win->window.scroll_state = WIN_SCROLL_INNER;
@@ -281,6 +304,8 @@ win_create_xmlconsole(void)
 ProfWin*
 win_create_plugin(const char* const plugin_name, const char* const tag)
 {
+    assert(plugin_name != NULL);
+    assert(tag != NULL);
    ProfPluginWin* new_win = malloc(sizeof(ProfPluginWin));
    new_win->window.type = WIN_PLUGIN;
    new_win->window.scroll_state = WIN_SCROLL_INNER;
@@ -297,6 +322,7 @@ win_create_plugin(const char* const plugin_name, const char* const tag)
 ProfWin*
 win_create_vcard(vCard* vcard)
 {
+    assert(vcard != NULL);
    ProfVcardWin* new_win = malloc(sizeof(ProfVcardWin));
    new_win->window.type = WIN_VCARD;
    new_win->window.scroll_state = WIN_SCROLL_INNER;
@@ -348,7 +374,7 @@ win_get_title(ProfWin* window)
        const ProfConfWin* confwin = (ProfConfWin*)window;
        assert(confwin->memcheck == PROFCONFWIN_MEMCHECK);
        auto_gchar gchar* mucwin_title = mucwin_generate_title(confwin->roomjid, PREF_TITLEBAR_MUC_TITLE);
-        if (confwin->form->modified) {
+        if (confwin->form && confwin->form->modified) {
            return g_strconcat(mucwin_title, " config *", NULL);
        }
        return g_strconcat(mucwin_title, " config", NULL);
@@ -556,7 +582,25 @@ win_show_subwin(ProfWin* window)
    }

    ProfLayoutSplit* layout = (ProfLayoutSplit*)window->layout;
+    // If a subwindow already exists (e.g. repeated call), destroy it to avoid leaks
+    if (layout->subwin) {
+        delwin(layout->subwin);
+        layout->subwin = NULL;
+    }
+
+    // Ensure minimum width to avoid creating a zero-width pad
+    if (subwin_cols <= 0) {
+        subwin_cols = 1;
+    }
+
    layout->subwin = newpad(PAD_SIZE, subwin_cols);
+    if (layout->subwin == NULL) {
+        // Failed to allocate subwindow; keep base window resized to full width
+        log_error("Failed to create subwindow pad (cols=%d)", subwin_cols);
+        wresize(layout->base.win, PAD_SIZE, cols);
+        win_redraw(window);
+        return;
+    }
    wbkgd(layout->subwin, theme_attrs(THEME_TEXT));
    wresize(layout->base.win, PAD_SIZE, cols - subwin_cols);
    win_redraw(window);
@@ -701,11 +745,9 @@ void
 win_page_down(ProfWin* window, int scroll_size)
 {
    int total_rows = getcury(window->layout->win);
-    int total_rows_with_unread = total_rows + window->layout->unread_msg;
    int* page_start = &(window->layout->y_pos);
    int page_space = getmaxy(stdscr) - 4;
    int page_start_initial = *page_start;
-
    if (scroll_size == 0)
        scroll_size = page_space;
    win_scroll_state_t* scroll_state = &window->scroll_state;
@@ -714,11 +756,7 @@ win_page_down(ProfWin* window, int scroll_size)
    *page_start += scroll_size;

    // Scrolled down after reaching the bottom of the page
-    gboolean past_bottom = *page_start > total_rows_with_unread - page_space;
-    gboolean at_page_space_and_past_unread = (*page_start == page_space && *page_start >= total_rows_with_unread);
-    gboolean is_chat = window->type == WIN_CHAT;
-
-    if ((past_bottom || at_page_space_and_past_unread) && is_chat) {
+    if ((*page_start > total_rows - page_space || (*page_start == page_space && *page_start >= total_rows)) && window->type == WIN_CHAT) {
        int bf_size = buffer_size(window->layout->buffer);
        if (bf_size > 0 && *scroll_state != WIN_SCROLL_REACHED_BOTTOM) {
            // How many lines are left until end of the screen
@@ -752,16 +790,13 @@ win_page_down(ProfWin* window, int scroll_size)
    window->layout->paged = 1;

    // update only if position has changed
-    if ((page_start_initial != *page_start) || window->layout->unread_msg) {
+    if (page_start_initial != *page_start) {
        win_update_virtual(window);
    }

-    /* Switch off page if no messages left to read.
-     * TODO: update buffer end handling to check messages just after last entry.
-     */
-    if (*scroll_state == WIN_SCROLL_REACHED_BOTTOM) {
+    // switch off page if last line and space line visible
+    if (total_rows - *page_start == page_space) {
        window->layout->paged = 0;
-        window->layout->unread_msg = 0;
    }
 }

@@ -822,7 +857,6 @@ win_clear(ProfWin* window)
    int* page_start = &(window->layout->y_pos);
    *page_start = y;
    window->layout->paged = 1;
-    window->layout->unread_msg = 0;
    win_update_virtual(window);
 }

@@ -910,6 +944,11 @@ win_refresh_with_subwin(ProfWin* window)
    int row_end = screen_mainwin_row_end();
    ProfLayoutSplit* layout = (ProfLayoutSplit*)window->layout;

+    // Safety: if subwindow is not active, nothing to refresh
+    if (layout == NULL || layout->subwin == NULL) {
+        return;
+    }
+
    if (window->type == WIN_MUC) {
        subwin_cols = win_occpuants_cols();
    } else if (window->type == WIN_CONSOLE) {
@@ -927,7 +966,6 @@ void
 win_move_to_end(ProfWin* window)
 {
    window->layout->paged = 0;
-    window->layout->unread_msg = 0;

    int rows = getmaxy(stdscr);
    int y = getcury(window->layout->win);
@@ -1710,13 +1748,6 @@ win_newline(ProfWin* window)
 static void
 _win_printf(ProfWin* window, const char* show_char, int pad_indent, GDateTime* timestamp, int flags, theme_item_t theme_item, const char* const display_from, const char* const from_jid, const char* const message_id, const char* const message, ...)
 {
-
-    /* Prevent printing and buffer update when user is viewing message history [SCROLLING]*/
-    if (window->layout->paged && wins_is_current(window)) {
-        window->layout->unread_msg++;
-        return;
-    }
-
    if (timestamp == NULL) {
        timestamp = g_date_time_new_now_local();
    } else {
@@ -2038,7 +2069,14 @@ win_print_loading_history(ProfWin* window)
    gboolean is_buffer_empty = buffer_size(window->layout->buffer) == 0;

    if (!is_buffer_empty) {
-        timestamp = buffer_get_entry(window->layout->buffer, 0)->time;
+        ProfBuffEntry* first = buffer_get_entry(window->layout->buffer, 0);
+        if (first && first->time) {
+            timestamp = first->time;
+        } else {
+            // Fallback to current time if entry/time is unavailable
+            timestamp = g_date_time_new_now_local();
+            is_buffer_empty = TRUE; // ensure we unref fallback timestamp below
+        }
    } else {
        timestamp = g_date_time_new_now_local();
    }
--- a/src/ui/window_list.c
+++ b/src/ui/window_list.c
@@ -407,8 +407,10 @@ wins_get_by_string(const char* str)
        if (barejid) {
            ProfChatWin* chatwin = wins_get_chat(barejid);
            if (chatwin) {
+                free(barejid);
                return (ProfWin*)chatwin;
            }
+            free(barejid);
        }
    }

@@ -603,6 +605,9 @@ wins_new_xmlconsole(void)
 {
    int result = _wins_get_next_available_num(keys);
    ProfWin* newwin = win_create_xmlconsole();
+    if (!newwin) {
+        return NULL;
+    }
    _wins_htable_insert(windows, GINT_TO_POINTER(result), newwin);
    autocomplete_add(wins_ac, "xmlconsole");
    autocomplete_add(wins_close_ac, "xmlconsole");
@@ -614,6 +619,9 @@ wins_new_chat(const char* const barejid)
 {
    int result = _wins_get_next_available_num(keys);
    ProfWin* newwin = win_create_chat(barejid);
+    if (!newwin) {
+        return NULL;
+    }
    _wins_htable_insert(windows, GINT_TO_POINTER(result), newwin);

    autocomplete_add(wins_ac, barejid);
@@ -637,6 +645,9 @@ wins_new_muc(const char* const roomjid)
 {
    int result = _wins_get_next_available_num(keys);
    ProfWin* newwin = win_create_muc(roomjid);
+    if (!newwin) {
+        return NULL;
+    }
    _wins_htable_insert(windows, GINT_TO_POINTER(result), newwin);
    autocomplete_add(wins_ac, roomjid);
    autocomplete_add(wins_close_ac, roomjid);
@@ -651,6 +662,9 @@ wins_new_config(const char* const roomjid, DataForm* form, ProfConfWinCallback s
 {
    int result = _wins_get_next_available_num(keys);
    ProfWin* newwin = win_create_config(roomjid, form, submit, cancel, userdata);
+    if (!newwin) {
+        return NULL;
+    }
    _wins_htable_insert(windows, GINT_TO_POINTER(result), newwin);

    return newwin;
@@ -661,6 +675,9 @@ wins_new_private(const char* const fulljid)
 {
    int result = _wins_get_next_available_num(keys);
    ProfWin* newwin = win_create_private(fulljid);
+    if (!newwin) {
+        return NULL;
+    }
    _wins_htable_insert(windows, GINT_TO_POINTER(result), newwin);
    autocomplete_add(wins_ac, fulljid);
    autocomplete_add(wins_close_ac, fulljid);
@@ -675,6 +692,9 @@ wins_new_plugin(const char* const plugin_name, const char* const tag)
 {
    int result = _wins_get_next_available_num(keys);
    ProfWin* newwin = win_create_plugin(plugin_name, tag);
+    if (!newwin) {
+        return NULL;
+    }
    _wins_htable_insert(windows, GINT_TO_POINTER(result), newwin);
    autocomplete_add(wins_ac, tag);
    autocomplete_add(wins_close_ac, tag);
@@ -686,6 +706,9 @@ wins_new_vcard(vCard* vcard)
 {
    int result = _wins_get_next_available_num(keys);
    ProfWin* newwin = win_create_vcard(vcard);
+    if (!newwin) {
+        return NULL;
+    }
    _wins_htable_insert(windows, GINT_TO_POINTER(result), newwin);

    return newwin;
--- a/src/xmpp/capabilities.c
+++ b/src/xmpp/capabilities.c
@@ -171,16 +171,15 @@ caps_get_features(void)
 {
    GList* result = NULL;

-    GList* features_as_list = g_hash_table_get_keys(prof_features);
-    GList* curr = features_as_list;
-    while (curr) {
-        result = g_list_append(result, strdup(curr->data));
-        curr = g_list_next(curr);
+    GHashTableIter iter;
+    gpointer key, value;
+    g_hash_table_iter_init(&iter, prof_features);
+    while (g_hash_table_iter_next(&iter, &key, &value)) {
+        result = g_list_append(result, strdup((char*)key));
    }
-    g_list_free(features_as_list);

    GList* plugin_features = plugins_get_disco_features();
-    curr = plugin_features;
+    GList* curr = plugin_features;
    while (curr) {
        result = g_list_append(result, strdup(curr->data));
        curr = g_list_next(curr);
--- a/src/xmpp/connection.c
+++ b/src/xmpp/connection.c
@@ -148,7 +148,7 @@ connection_init(void)
    if (string_to_verbosity(v, &verbosity, &err_msg)) {
        xmpp_ctx_set_verbosity(conn.xmpp_ctx, verbosity);
    } else {
-        cons_show(err_msg);
+        cons_show("%s", err_msg);
    }
    conn.xmpp_conn = xmpp_conn_new(conn.xmpp_ctx);

@@ -312,7 +312,6 @@ iq_reg2_cb(xmpp_conn_t* xmpp_conn, xmpp_stanza_t* stanza, void* userdata)
    goto quit;

 quit:
-    log_debug("[CONNDBG] iq_reg2_cb: disconnecting after registration completion");
    xmpp_disconnect(xmpp_conn);

    return 0;
@@ -551,7 +550,6 @@ connection_disconnect(void)
    // don't disconnect already disconnected connection,
    // or we get infinite loop otherwise
    if (conn.conn_last_event == XMPP_CONN_CONNECT) {
-        log_debug("[CONNDBG] connection_disconnect: user-initiated disconnect (status=%d)", (int)conn.conn_status);
        conn.conn_status = JABBER_DISCONNECTING;
        xmpp_disconnect(conn.xmpp_conn);

@@ -559,7 +557,6 @@ connection_disconnect(void)
            session_process_events();
        }
    } else {
-        log_debug("[CONNDBG] connection_disconnect: already disconnected (last_event=%d)", (int)conn.conn_last_event);
        conn.conn_status = JABBER_DISCONNECTED;
    }

@@ -638,22 +635,18 @@ gboolean
 connection_supports(const char* const feature)
 {
    gboolean ret = FALSE;
-    GList* jids = g_hash_table_get_keys(conn.features_by_jid);
+    GHashTableIter iter;
+    gpointer key, value;

-    GList* curr = jids;
-    while (curr) {
-        char* jid = curr->data;
-        GHashTable* features = g_hash_table_lookup(conn.features_by_jid, jid);
+    g_hash_table_iter_init(&iter, conn.features_by_jid);
+    while (g_hash_table_iter_next(&iter, &key, &value)) {
+        GHashTable* features = (GHashTable*)value;
        if (features && g_hash_table_lookup(features, feature)) {
            ret = TRUE;
            break;
        }
-
-        curr = g_list_next(curr);
    }

-    g_list_free(jids);
-
    return ret;
 }

@@ -664,22 +657,17 @@ connection_jid_for_feature(const char* const feature)
        return NULL;
    }

-    GList* jids = g_hash_table_get_keys(conn.features_by_jid);
+    GHashTableIter iter;
+    gpointer key, value;

-    GList* curr = jids;
-    while (curr) {
-        char* jid = curr->data;
-        GHashTable* features = g_hash_table_lookup(conn.features_by_jid, jid);
+    g_hash_table_iter_init(&iter, conn.features_by_jid);
+    while (g_hash_table_iter_next(&iter, &key, &value)) {
+        GHashTable* features = (GHashTable*)value;
        if (features && g_hash_table_lookup(features, feature)) {
-            g_list_free(jids);
-            return jid;
+            return (const char*)key;
        }
-
-        curr = g_list_next(curr);
    }

-    g_list_free(jids);
-
    return NULL;
 }

@@ -1022,9 +1010,6 @@ _connection_handler(xmpp_conn_t* const xmpp_conn, const xmpp_conn_event_t status
    // disconnected
    case XMPP_CONN_DISCONNECT:
        log_debug("Connection handler: XMPP_CONN_DISCONNECT");
-        log_debug("[CONNDBG] disconnect: previous_status=%d error=%d has_stream_error=%s",
-                  (int)conn.conn_status, error,
-                  (stream_error && stream_error->stanza) ? "yes" : "no");

        // lost connection for unknown reason
        if (conn.conn_status == JABBER_CONNECTED || conn.conn_status == JABBER_DISCONNECTING) {
@@ -1034,7 +1019,7 @@ _connection_handler(xmpp_conn_t* const xmpp_conn, const xmpp_conn_event_t status
                conn.sm_state = xmpp_conn_get_sm_state(conn.xmpp_conn);
                if (send_queue_len > 0 && prefs_get_boolean(PREF_STROPHE_SM_RESEND)) {
                    conn.queued_messages = calloc(send_queue_len + 1, sizeof(*conn.queued_messages));
-                    for (int n = 0; n < send_queue_len && conn.queued_messages[n]; ++n) {
+                    for (int n = 0; n < send_queue_len; ++n) {
                        conn.queued_messages[n] = xmpp_conn_send_queue_drop_element(conn.xmpp_conn, XMPP_QUEUE_OLDEST);
                    }
                } else if (send_queue_len > 0) {
@@ -1189,12 +1174,13 @@ connection_debug_print_features()
            continue;
        }

-        GList* feature_keys = g_hash_table_get_keys(features);
-        for (GList* l = feature_keys; l != NULL; l = l->next) {
-            const char* feature = (const char*)l->data;
+        GHashTableIter feature_iter;
+        gpointer feature_key, feature_value;
+        g_hash_table_iter_init(&feature_iter, features);
+        while (g_hash_table_iter_next(&feature_iter, &feature_key, &feature_value)) {
+            const char* feature = (const char*)feature_key;
            log_debug("%s:\t%s", jid, feature);
        }
-        g_list_free(feature_keys);
    }

    log_debug("=== End of Features ===");
--- a/src/xmpp/form.c
+++ b/src/xmpp/form.c
@@ -437,18 +437,7 @@ form_get_form_type_field(DataForm* form)
 gboolean
 form_tag_exists(DataForm* form, const char* const tag)
 {
-    GList* tags = g_hash_table_get_keys(form->tag_to_var);
-    GList* curr = tags;
-    while (curr) {
-        if (g_strcmp0(curr->data, tag) == 0) {
-            g_list_free(tags);
-            return TRUE;
-        }
-        curr = g_list_next(curr);
-    }
-
-    g_list_free(tags);
-    return FALSE;
+    return g_hash_table_contains(form->tag_to_var, tag);
 }

 form_field_type_t
--- a/src/xmpp/ox.c
+++ b/src/xmpp/ox.c
@@ -326,7 +326,7 @@ _ox_metadata_result(xmpp_stanza_t* const stanza, void* const userdata)

        if (fingerprint) {
            if (strlen(fingerprint) == KEYID_LENGTH) {
-                cons_show(fingerprint);
+                cons_show("%s", fingerprint);
            } else {
                cons_show("OX: Wrong char size of public key");
                log_error("[OX] Wrong chat size of public key %s", fingerprint);
--- a/src/xmpp/session.c
+++ b/src/xmpp/session.c
@@ -218,7 +218,6 @@ session_connect_with_details(const char* const jid, const char* const passwd, co
 void
 session_autoping_fail(void)
 {
-    log_debug("[CONNDBG] session_autoping_fail: autoping timeout, triggering lost connection");
    session_lost_connection();
 }

@@ -265,14 +264,11 @@ session_process_events(void)
        if ((reconnect_sec != 0) && reconnect_timer) {
            int elapsed_sec = g_timer_elapsed(reconnect_timer, NULL);
            if (elapsed_sec > reconnect_sec) {
-                log_debug("[CONNDBG] session_process_events: auto-reconnect triggered after %d seconds (threshold=%d)",
-                          elapsed_sec, reconnect_sec);
                session_reconnect_now();
            }
        }
        break;
    case JABBER_RECONNECT:
-        log_debug("[CONNDBG] session_process_events: JABBER_RECONNECT state, calling session_reconnect_now");
        session_reconnect_now();
        break;
    default:
@@ -331,12 +327,12 @@ session_login_success(gboolean secured)

    // logged in with account
    if (saved_account.name) {
-        log_debug("[CONNDBG] Connection handler: logged in with account name: %s", saved_account.name);
+        log_debug("Connection handler: logged in with account name: %s", saved_account.name);
        sv_ev_login_account_success(saved_account.name, secured);

        // logged in without account, use details to create new account
    } else {
-        log_debug("[CONNDBG] Connection handler: logged in with jid: %s", saved_details.name);
+        log_debug("Connection handler: logged in with jid: %s", saved_details.name);
        accounts_add(saved_details.name, saved_details.altdomain, saved_details.port, saved_details.tls_policy, saved_details.auth_policy);
        accounts_set_jid(saved_details.name, saved_details.jid);

@@ -375,11 +371,11 @@ void
 session_login_failed(void)
 {
    if (reconnect_timer == NULL) {
-        log_debug("[CONNDBG] Connection handler: No reconnect timer");
+        log_debug("Connection handler: No reconnect timer");
        sv_ev_failed_login();
        _session_free_internals();
    } else {
-        log_debug("[CONNDBG] Connection handler: Restarting reconnect timer");
+        log_debug("Connection handler: Restarting reconnect timer");
        if (prefs_get_reconnect() != 0) {
            g_timer_start(reconnect_timer);
        }
@@ -393,16 +389,12 @@ session_login_failed(void)
 void
 session_lost_connection(void)
 {
-    log_debug("[CONNDBG] session_lost_connection: connection lost, reconnect_interval=%d",
-              prefs_get_reconnect());
    /* this callback also clears all cached data */
    sv_ev_lost_connection();
    if (prefs_get_reconnect() != 0) {
        assert(reconnect_timer == NULL);
        reconnect_timer = g_timer_new();
-        log_debug("[CONNDBG] session_lost_connection: reconnect timer started");
    } else {
-        log_debug("[CONNDBG] session_lost_connection: auto-reconnect disabled, cleaning up");
        _session_free_internals();
    }
 }
--- a/tests/functionaltests/functionaltests.c
+++ b/tests/functionaltests/functionaltests.c
@@ -1,44 +1,11 @@
-/*
- * functionaltests.c
- *
- * Functional tests for CProof XMPP client.
- * Uses cmocka framework with stabber mock XMPP server.
- *
- * Each test is wrapped with PROF_FUNC_TEST macro which sets up
- * init_prof_test (starts stabber server and profanity client)
- * and close_prof_test (cleanup) as setup/teardown functions.
- *
- * NOTE: We restart client and server for each test to ensure complete
- * isolation. This prevents state leakage between tests (roster entries,
- * MUC rooms, presence subscriptions, etc.). While slower, it eliminates
- * flaky tests caused by leftover state. The overhead is acceptable since
- * functional tests run less frequently than unit tests.
- *
- * Tests are organized into groups for better maintainability and parallel execution:
- *   Group 1: Connect, Ping, Rooms, Software
- *   Group 2: Message, Receipts, Roster, Chat Session
- *   Group 3: Presence, Disconnect
- *   Group 4: MUC, Carbons
- *
- * Parallel execution:
- *   ./functionaltests        - run all tests sequentially
- *   ./functionaltests N      - run group N only (N = 1..num_groups)
- *
- * For parallel execution, run multiple groups simultaneously:
- *   ./functionaltests 1 & ./functionaltests 2 & ./functionaltests 3 & ./functionaltests 4 & wait
- */
-
 #include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <string.h>
 #include "prof_cmocka.h"
 #include <sys/stat.h>

 #include "config.h"

-#include "common.h"
 #include "proftest.h"
 #include "test_connect.h"
 #include "test_ping.h"
@@ -53,93 +20,30 @@
 #include "test_muc.h"
 #include "test_disconnect.h"

-/* Macro to wrap each test with setup/teardown functions */
 #define PROF_FUNC_TEST(test) cmocka_unit_test_setup_teardown(test, init_prof_test, close_prof_test)

-int
-main(int argc, char* argv[])
-{
-    int group = 0;  /* 0 = all groups */
-    if (argc > 1) {
-        group = atoi(argv[1]);
-        if (group < 1 || group > 4) {
-            fprintf(stderr, "Usage: %s [group]\n", argv[0]);
-            fprintf(stderr, "  group: 1-4 to run specific group, or omit for all\n");
-            return 1;
-        }
-    }
+int main(int argc, char* argv[]) {
+
+    const struct CMUnitTest all_tests[] = {

-    /* ============================================================
-     * GROUP 1: Connect, Ping, Rooms, Software
-     * Basic XMPP session establishment and server queries
-     * ============================================================ */
-    const struct CMUnitTest group1_tests[] = {
-        /* Connection tests - verify login, roster, bookmarks */
        PROF_FUNC_TEST(connect_jid_requests_roster),
        PROF_FUNC_TEST(connect_jid_sends_presence_after_receiving_roster),
        PROF_FUNC_TEST(connect_jid_requests_bookmarks),
        PROF_FUNC_TEST(connect_bad_password),
        PROF_FUNC_TEST(connect_shows_presence_updates),

-        /* Ping tests - XEP-0199 XMPP Ping */
        PROF_FUNC_TEST(ping_server),
        PROF_FUNC_TEST(ping_server_not_supported),
        PROF_FUNC_TEST(ping_responds_to_server_request),
        PROF_FUNC_TEST(ping_jid),
        PROF_FUNC_TEST(ping_jid_not_supported),

-        /* Room discovery - XEP-0045 */
        PROF_FUNC_TEST(rooms_query),

-        /* Software Version - XEP-0092 */
-        PROF_FUNC_TEST(send_software_version_request),
-        PROF_FUNC_TEST(display_software_version_result),
-        PROF_FUNC_TEST(shows_message_when_software_version_error),
-        PROF_FUNC_TEST(display_software_version_result_when_from_domainpart),
-        PROF_FUNC_TEST(show_message_in_chat_window_when_no_resource),
-        PROF_FUNC_TEST(display_software_version_result_in_chat),
-    };
-
-    /* ============================================================
-     * GROUP 2: Message, Receipts, Roster, Chat Session
-     * Core messaging and contact management
-     * ============================================================ */
-    const struct CMUnitTest group2_tests[] = {
-        /* Basic message send/receive */
-        PROF_FUNC_TEST(message_send),
-        PROF_FUNC_TEST(message_receive_console),
-        PROF_FUNC_TEST(message_receive_chatwin),
-
-        /* Message receipts - XEP-0184 */
-        PROF_FUNC_TEST(does_not_send_receipt_request_to_barejid),
-        PROF_FUNC_TEST(send_receipt_request),
-        PROF_FUNC_TEST(send_receipt_on_request),
-
-        /* Roster management - add/remove/rename contacts */
-        PROF_FUNC_TEST(sends_new_item),
-        PROF_FUNC_TEST(sends_new_item_nick),
-        PROF_FUNC_TEST(sends_remove_item),
-        PROF_FUNC_TEST(sends_remove_item_nick),
-        PROF_FUNC_TEST(sends_nick_change),
-
-        /* Chat session management - bare/full JID routing */
-        PROF_FUNC_TEST(sends_message_to_barejid_when_contact_offline),
-        PROF_FUNC_TEST(sends_message_to_barejid_when_contact_online),
-        PROF_FUNC_TEST(sends_message_to_fulljid_when_received_from_fulljid),
-        PROF_FUNC_TEST(sends_subsequent_messages_to_fulljid),
-        PROF_FUNC_TEST(resets_to_barejid_after_presence_received),
-        PROF_FUNC_TEST(new_session_when_message_received_from_different_fulljid),
-    };
-
-    /* ============================================================
-     * GROUP 3: Presence, Disconnect
-     * Online/away/xa/dnd/chat status management
-     * ============================================================ */
-    const struct CMUnitTest group3_tests[] = {
-        PROF_FUNC_TEST(presence_online),
-        PROF_FUNC_TEST(presence_online_with_message),
        PROF_FUNC_TEST(presence_away),
        PROF_FUNC_TEST(presence_away_with_message),
+        PROF_FUNC_TEST(presence_online),
+        PROF_FUNC_TEST(presence_online_with_message),
        PROF_FUNC_TEST(presence_xa),
        PROF_FUNC_TEST(presence_xa_with_message),
        PROF_FUNC_TEST(presence_dnd),
@@ -152,71 +56,57 @@ main(int argc, char* argv[])
        PROF_FUNC_TEST(presence_received),
        PROF_FUNC_TEST(presence_missing_resource_defaults),

-        /* Disconnect - clean session termination */
-        PROF_FUNC_TEST(disconnect_ends_session),
-    };
+        PROF_FUNC_TEST(message_send),
+        PROF_FUNC_TEST(message_receive_console),
+        PROF_FUNC_TEST(message_receive_chatwin),

-    /* ============================================================
-     * GROUP 4: MUC, Carbons
-     * Multi-user chat and message synchronization
-     * ============================================================ */
-    const struct CMUnitTest group4_tests[] = {
-        /* MUC room join with various options - XEP-0045 */
-        PROF_FUNC_TEST(sends_room_join),
-        PROF_FUNC_TEST(sends_room_join_with_nick),
-        PROF_FUNC_TEST(sends_room_join_with_password),
-        PROF_FUNC_TEST(sends_room_join_with_nick_and_password),
+        PROF_FUNC_TEST(sends_message_to_barejid_when_contact_offline),
+        PROF_FUNC_TEST(sends_message_to_barejid_when_contact_online),
+        PROF_FUNC_TEST(sends_message_to_fulljid_when_received_from_fulljid),
+        PROF_FUNC_TEST(sends_subsequent_messages_to_fulljid),
+        PROF_FUNC_TEST(resets_to_barejid_after_presence_received),
+        PROF_FUNC_TEST(new_session_when_message_received_from_different_fulljid),

-        /* MUC room information display */
-        PROF_FUNC_TEST(shows_role_and_affiliation_on_join),
-        PROF_FUNC_TEST(shows_subject_on_join),
-        PROF_FUNC_TEST(shows_occupant_join),
-
-        /* MUC messaging */
-        PROF_FUNC_TEST(shows_message),
-        PROF_FUNC_TEST(shows_me_message_from_occupant),
-        PROF_FUNC_TEST(shows_me_message_from_self),
-
-        /* MUC console notification settings */
-        PROF_FUNC_TEST(shows_all_messages_in_console_when_window_not_focussed),
-        PROF_FUNC_TEST(shows_first_message_in_console_when_window_not_focussed),
-        PROF_FUNC_TEST(shows_no_message_in_console_when_window_not_focussed),
-
-        /* Message Carbons - XEP-0280 (message sync across devices) */
        PROF_FUNC_TEST(send_enable_carbons),
        PROF_FUNC_TEST(connect_with_carbons_enabled),
        PROF_FUNC_TEST(send_disable_carbons),
        PROF_FUNC_TEST(receive_carbon),
        PROF_FUNC_TEST(receive_self_carbon),
        PROF_FUNC_TEST(receive_private_carbon),
+
+        PROF_FUNC_TEST(send_receipt_request),
+        PROF_FUNC_TEST(send_receipt_on_request),
+        PROF_FUNC_TEST(does_not_send_receipt_request_to_barejid),
+        PROF_FUNC_TEST(sends_new_item),
+        PROF_FUNC_TEST(sends_new_item_nick),
+        PROF_FUNC_TEST(sends_remove_item),
+        PROF_FUNC_TEST(sends_remove_item_nick),
+        PROF_FUNC_TEST(sends_nick_change),
+
+        PROF_FUNC_TEST(send_software_version_request),
+        PROF_FUNC_TEST(display_software_version_result),
+        PROF_FUNC_TEST(shows_message_when_software_version_error),
+        PROF_FUNC_TEST(display_software_version_result_when_from_domainpart),
+        PROF_FUNC_TEST(show_message_in_chat_window_when_no_resource),
+        PROF_FUNC_TEST(display_software_version_result_in_chat),
+
+        PROF_FUNC_TEST(sends_room_join),
+        PROF_FUNC_TEST(sends_room_join_with_nick),
+        PROF_FUNC_TEST(sends_room_join_with_password),
+        PROF_FUNC_TEST(sends_room_join_with_nick_and_password),
+        PROF_FUNC_TEST(shows_role_and_affiliation_on_join),
+        PROF_FUNC_TEST(shows_subject_on_join),
+        PROF_FUNC_TEST(shows_history_message),
+        PROF_FUNC_TEST(shows_occupant_join),
+        PROF_FUNC_TEST(shows_message),
+        PROF_FUNC_TEST(shows_me_message_from_occupant),
+        PROF_FUNC_TEST(shows_me_message_from_self),
+        PROF_FUNC_TEST(shows_all_messages_in_console_when_window_not_focussed),
+        PROF_FUNC_TEST(shows_first_message_in_console_when_window_not_focussed),
+        PROF_FUNC_TEST(shows_no_message_in_console_when_window_not_focussed),
+
+        PROF_FUNC_TEST(disconnect_ends_session),
    };

-    /* Test group registry for easy extension */
-    struct {
-        const char* name;
-        const struct CMUnitTest* tests;
-        size_t count;
-    } groups[] = {
-        { "Group 1: Connect/Ping/Rooms/Software", group1_tests, ARRAY_SIZE(group1_tests) },
-        { "Group 2: Message/Receipts/Roster/Session", group2_tests, ARRAY_SIZE(group2_tests) },
-        { "Group 3: Presence/Disconnect", group3_tests, ARRAY_SIZE(group3_tests) },
-        { "Group 4: MUC/Carbons", group4_tests, ARRAY_SIZE(group4_tests) },
-    };
-    const int num_groups = ARRAY_SIZE(groups);
-
-    int result = 0;
-
-    if (group > 0 && group <= num_groups) {
-        /* Run specific group */
-        result = _cmocka_run_group_tests(groups[group - 1].name, groups[group - 1].tests,
-                                         groups[group - 1].count, NULL, NULL);
-    } else {
-        /* Run all groups sequentially */
-        for (int i = 0; i < num_groups; i++) {
-            result |= _cmocka_run_group_tests(groups[i].name, groups[i].tests,
-                                              groups[i].count, NULL, NULL);
-        }
-    }
-
-    return result;
+    return cmocka_run_group_tests(all_tests, NULL, NULL);
 }
--- a/tests/functionaltests/proftest.c
+++ b/tests/functionaltests/proftest.c
@@ -8,12 +8,9 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <pty.h>
-#include <fcntl.h>
-#include <sys/select.h>
-#include <regex.h>

 #include <stabber.h>
+#include <expect.h>

 #include "proftest.h"

@@ -21,27 +18,6 @@ char *config_orig;
 char *data_orig;

 int fd = 0;
-int stub_port = 5230;
-pid_t child_pid = 0;
-
-/*
- * Dynamic XDG paths based on stub_port for parallel test execution.
- * Each test instance gets unique directories to avoid file conflicts.
- */
-char xdg_config_home[256];
-char xdg_data_home[256];
-
-/*
- * Buffer for accumulating output from profanity.
- * 64KB is sufficient for typical test output while keeping memory usage
- * reasonable. When full, older half is discarded (ring buffer behavior).
- */
-#define OUTPUT_BUF_SIZE 65536
-static char output_buffer[OUTPUT_BUF_SIZE];
-static size_t output_len = 0;
-
-/* Timeout for expect operations in seconds */
-static int expect_timeout = 30;

 gboolean
 _create_dir(const char *name)
@@ -84,7 +60,7 @@ _mkdir_recursive(const char *dir)
 void
 _create_config_dir(void)
 {
-    GString *profanity_dir = g_string_new(xdg_config_home);
+    GString *profanity_dir = g_string_new(XDG_CONFIG_HOME);
    g_string_append(profanity_dir, "/profanity");

    if (!_mkdir_recursive(profanity_dir->str)) {
@@ -97,7 +73,7 @@ _create_config_dir(void)
 void
 _create_data_dir(void)
 {
-    GString *profanity_dir = g_string_new(xdg_data_home);
+    GString *profanity_dir = g_string_new(XDG_DATA_HOME);
    g_string_append(profanity_dir, "/profanity");

    if (!_mkdir_recursive(profanity_dir->str)) {
@@ -110,7 +86,7 @@ _create_data_dir(void)
 void
 _create_chatlogs_dir(void)
 {
-    GString *chatlogs_dir = g_string_new(xdg_data_home);
+    GString *chatlogs_dir = g_string_new(XDG_DATA_HOME);
    g_string_append(chatlogs_dir, "/profanity/chatlogs");

    if (!_mkdir_recursive(chatlogs_dir->str)) {
@@ -123,7 +99,7 @@ _create_chatlogs_dir(void)
 void
 _create_logs_dir(void)
 {
-    GString *logs_dir = g_string_new(xdg_data_home);
+    GString *logs_dir = g_string_new(XDG_DATA_HOME);
    g_string_append(logs_dir, "/profanity/logs");

    if (!_mkdir_recursive(logs_dir->str)) {
@@ -136,124 +112,42 @@ _create_logs_dir(void)
 void
 _cleanup_dirs(void)
 {
-    char cmd[512];
-    snprintf(cmd, sizeof(cmd), "rm -rf ./tests/functionaltests/files/%d", stub_port);
-    int res = system(cmd);
+    int res = system("rm -rf ./tests/functionaltests/files");
    if (res == -1) {
        assert_true(FALSE);
    }
 }

-/*
- * Read available data from fd into output_buffer with timeout.
- * Returns number of bytes read, 0 on timeout, -1 on error.
- */
-static int
-_read_output(int timeout_ms)
-{
-    fd_set readfds;
-    struct timeval tv;
-    
-    FD_ZERO(&readfds);
-    FD_SET(fd, &readfds);
-    
-    tv.tv_sec = timeout_ms / 1000;
-    tv.tv_usec = (timeout_ms % 1000) * 1000;
-    
-    int ret = select(fd + 1, &readfds, NULL, NULL, &tv);
-    if (ret <= 0) {
-        return ret;
-    }
-    
-    size_t space = OUTPUT_BUF_SIZE - output_len - 1;
-    if (space <= 0) {
-        /* Buffer full, shift content */
-        memmove(output_buffer, output_buffer + OUTPUT_BUF_SIZE/2, OUTPUT_BUF_SIZE/2);
-        output_len = OUTPUT_BUF_SIZE/2;
-        space = OUTPUT_BUF_SIZE - output_len - 1;
-    }
-    
-    ssize_t n = read(fd, output_buffer + output_len, space);
-    if (n > 0) {
-        output_len += n;
-        output_buffer[output_len] = '\0';
-    }
-    return n;
-}
-
-/*
- * Custom implementation of exp_spawnl using forkpty.
- * This avoids the segfault bug in libexpect on Arch Linux.
- */
 void
 prof_start(void)
 {
-    struct winsize ws;
-    ws.ws_row = 24;
-    ws.ws_col = 300;  /* Match COLUMNS=300 from start_profanity.sh */
-    ws.ws_xpixel = 0;
-    ws.ws_ypixel = 0;
-    
-    /* Reset output buffer */
-    output_len = 0;
-    output_buffer[0] = '\0';
-    
-    child_pid = forkpty(&fd, NULL, NULL, &ws);
-    
-    if (child_pid < 0) {
-        fd = -1;
-        return;
-    }
-    
-    if (child_pid == 0) {
-        /* Child process */
-        setenv("COLUMNS", "300", 1);
-        setenv("TERM", "xterm", 1);
-        
-        execl("./profanity", "./profanity", "-l", "DEBUG", NULL);
-        
-        /* If exec fails */
-        fprintf(stderr, "execl failed: %s\n", strerror(errno));
-        _exit(127);
-    }
-    
-    /* Parent process */
-    /* Set non-blocking mode for reading */
-    int flags = fcntl(fd, F_GETFL, 0);
-    fcntl(fd, F_SETFL, flags | O_NONBLOCK);
+    // helper script sets terminal columns, avoids assertions failing
+    // based on the test runner terminal size
+    fd = exp_spawnl("sh",
+        "sh",
+        "-c",
+        "./tests/functionaltests/start_profanity.sh",
+        NULL);
+    FILE *fp = fdopen(fd, "r+");
+
+    assert_true(fp != NULL);
+
+    setbuf(fp, (char *)0);
 }

 int
 init_prof_test(void **state)
 {
-    gboolean started = FALSE;
-    for (int p = 5230; p < 5250; ++p) {
-        int ret = stbbr_start(STBBR_LOGDEBUG, p, 0);
-        if (ret == 0) {
-            stub_port = p;
-            started = TRUE;
-            break;
-        }
-    }
-    if (!started) {
-        assert_true(FALSE); // could not start stabber on any port in range
+    if (stbbr_start(STBBR_LOGDEBUG ,5230, 0) != 0) {
+        assert_true(FALSE);
        return -1;
    }

-    // Generate unique XDG paths based on stub_port for parallel execution
-    snprintf(xdg_config_home, sizeof(xdg_config_home),
-             "./tests/functionaltests/files/%d/xdg_config_home", stub_port);
-    snprintf(xdg_data_home, sizeof(xdg_data_home),
-             "./tests/functionaltests/files/%d/xdg_data_home", stub_port);
-
-    // Give stabber server thread time to start listening
-    usleep(100000); // 100ms
-
    config_orig = getenv("XDG_CONFIG_HOME");
    data_orig = getenv("XDG_DATA_HOME");

-    setenv("XDG_CONFIG_HOME", xdg_config_home, 1);
-    setenv("XDG_DATA_HOME", xdg_data_home, 1);
+    setenv("XDG_CONFIG_HOME", XDG_CONFIG_HOME, 1);
+    setenv("XDG_DATA_HOME", XDG_DATA_HOME, 1);

    _cleanup_dirs();

@@ -263,69 +157,50 @@ init_prof_test(void **state)
    _create_logs_dir();

    prof_start();
-    int prof_started = prof_output_regex("CProof\\. Type /help for help information\\.");
-    assert_true(prof_started);
+    assert_true(prof_output_exact("Profanity"));

    // set UI options to make expect assertions faster and more reliable
    prof_input("/inpblock timeout 5");
-    assert_true(prof_output_regex("Input blocking set to 5 milliseconds"));
+    assert_true(prof_output_exact("Input blocking set to 5 milliseconds"));
    prof_input("/inpblock dynamic off");
-    assert_true(prof_output_regex("Dynamic input blocking disabled"));
+    assert_true(prof_output_exact("Dynamic input blocking disabled"));
    prof_input("/notify chat off");
-    assert_true(prof_output_regex("Chat notifications disabled"));
+    assert_true(prof_output_exact("Chat notifications disabled"));
    prof_input("/notify room off");
-    assert_true(prof_output_regex("Room notifications disabled"));
+    assert_true(prof_output_exact("Room notifications disabled"));
    prof_input("/wrap off");
-    assert_true(prof_output_regex("Word wrap disabled"));
+    assert_true(prof_output_exact("Word wrap disabled"));
    prof_input("/roster hide");
-    assert_true(prof_output_regex("Roster disabled"));
+    assert_true(prof_output_exact("Roster disabled"));
    prof_input("/occupants default hide");
-    assert_true(prof_output_regex("Occupant list disabled"));
+    assert_true(prof_output_exact("Occupant list disabled"));
    prof_input("/time console off");
    prof_input("/time console off");
-    assert_true(prof_output_regex("Console time display disabled\\."));
+    assert_true(prof_output_exact("Console time display disabled."));
    prof_input("/time chat off");
-    assert_true(prof_output_regex("Chat time display disabled\\."));
+    assert_true(prof_output_exact("Chat time display disabled."));
    prof_input("/time muc off");
-    assert_true(prof_output_regex("MUC time display disabled\\."));
+    assert_true(prof_output_exact("MUC time display disabled."));
    prof_input("/time config off");
-    assert_true(prof_output_regex("Config time display disabled\\."));
+    assert_true(prof_output_exact("config time display disabled."));
    prof_input("/time private off");
-    assert_true(prof_output_regex("Private chat time display disabled\\."));
+    assert_true(prof_output_exact("Private chat time display disabled."));
    prof_input("/time xml off");
-    assert_true(prof_output_regex("XML Console time display disabled\\."));
+    assert_true(prof_output_exact("XML Console time display disabled."));
    return 0;
 }

 int
 close_prof_test(void **state)
 {
-    if (fd > 0 && child_pid > 0) {
-        prof_input("/quit");
-        // Give profanity time to process quit command
-        sleep(1);
-        waitpid(child_pid, NULL, 0);
-        close(fd);
-        fd = 0;
-        child_pid = 0;
-    }
+    prof_input("/quit");
+    waitpid(exp_pid, NULL, 0);
    _cleanup_dirs();

-    if (config_orig) {
-        setenv("XDG_CONFIG_HOME", config_orig, 1);
-    }
-    if (data_orig) {
-        setenv("XDG_DATA_HOME", data_orig, 1);
-    }
+    setenv("XDG_CONFIG_HOME", config_orig, 1);
+    setenv("XDG_DATA_HOME", data_orig, 1);

    stbbr_stop();
-    /*
-     * TODO: Replace with proper synchronization.
-     * stabber doesn't provide wait_stopped() API yet, so we use delay
-     * to ensure the port is released before the next test starts.
-     * See: https://git.jabber.space/devs/stabber/issues/3
-     */
-    usleep(100000);  // 100ms
    return 0;
 }

@@ -334,75 +209,20 @@ prof_input(const char *input)
 {
    GString *inp_str = g_string_new(input);
    g_string_append(inp_str, "\r");
-    ssize_t _wn = write(fd, inp_str->str, inp_str->len);
-    (void)_wn;
+    write(fd, inp_str->str, inp_str->len);
    g_string_free(inp_str, TRUE);
-    
-    /* Small delay to let profanity process input */
-    usleep(10000);
 }

-/*
- * Wait for exact text to appear in output.
- * Returns 1 if found, 0 if timeout.
- */
 int
 prof_output_exact(const char *text)
 {
-    time_t start = time(NULL);
-    
-    while (time(NULL) - start < expect_timeout) {
-        /* Read any available output */
-        while (_read_output(100) > 0) {
-            /* Keep reading while data available */
-        }
-        
-        /* Check if text is in buffer */
-        if (strstr(output_buffer, text) != NULL) {
-            return 1;
-        }
-        
-        usleep(50000);  /* 50ms */
-    }
-    
-    return 0;
+    return (1 == exp_expectl(fd, exp_exact, text, 1, exp_end));
 }

-/*
- * Wait for regex pattern to match in output.
- * Returns 1 if found, 0 if timeout.
- */
 int
-prof_output_regex(const char *pattern)
+prof_output_regex(const char *text)
 {
-    regex_t regex;
-    int ret;
-    
-    ret = regcomp(&regex, pattern, REG_EXTENDED | REG_NOSUB);
-    if (ret != 0) {
-        return 0;
-    }
-    
-    time_t start = time(NULL);
-    
-    while (time(NULL) - start < expect_timeout) {
-        /* Read any available output */
-        while (_read_output(100) > 0) {
-            /* Keep reading while data available */
-        }
-        
-        /* Check if pattern matches */
-        ret = regexec(&regex, output_buffer, 0, NULL, 0);
-        if (ret == 0) {
-            regfree(&regex);
-            return 1;
-        }
-        
-        usleep(50000);  /* 50ms */
-    }
-    
-    regfree(&regex);
-    return 0;
+    return (1 == exp_expectl(fd, exp_regexp, text, 1, exp_end));
 }

 void
@@ -421,40 +241,33 @@ prof_connect_with_roster(const char *roster)
    stbbr_for_query("jabber:iq:roster", roster_str->str);
    g_string_free(roster_str, TRUE);

-    stbbr_auth_passwd("password");
+    stbbr_for_id("prof_presence_1",
+        "<presence id='prof_presence_1' lang='en' to='stabber@localhost/profanity' from='stabber@localhost/profanity'>"
+            "<priority>0</priority>"
+            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io/' ver='f8mrtdyAmhnj8Ca+630bThSL718='/>"
+        "</presence>"
+    );

-    char connect_cmd[128];
-    snprintf(connect_cmd, sizeof(connect_cmd), "/connect stabber@localhost server 127.0.0.1 port %d tls disable auth legacy", stub_port);
-    prof_input(connect_cmd);
-    
-    assert_true(prof_output_regex("password:"));
+    prof_input("/connect stabber@localhost server 127.0.0.1 port 5230 tls allow");
    prof_input("password");

-    expect_timeout = 60;
-    assert_true(prof_output_regex("Connecting as stabber@localhost"));
-    assert_true(prof_output_regex("logged in successfully"));
-    assert_true(prof_output_regex(".+online.+ \\(priority 0\\)\\."));
-    
-    expect_timeout = 60;
-    // Wait for presence stanza to be sent (content-based, not ID-based)
-    // Match the actual attribute order from stanza_attach_caps
-    assert_true(stbbr_received(
-        "<presence id=\"*\">"
-            "<c xmlns=\"http://jabber.org/protocol/caps\" hash=\"sha-1\" node=\"http://profanity-im.github.io\" ver=\"*\"/>"
-        "</presence>"
-    ));
+    // Allow time for profanity to connect
+    exp_timeout = 30;
+    assert_true(prof_output_regex("stabber@localhost/profanity logged in successfully, .+online.+ \\(priority 0\\)\\."));
+    exp_timeout = 10;
+    stbbr_wait_for("prof_presence_*");
 }

 void
 prof_timeout(int timeout)
 {
-    expect_timeout = timeout;
+    exp_timeout = timeout;
 }

 void
 prof_timeout_reset(void)
 {
-    expect_timeout = 60;
+    exp_timeout = 10;
 }

 void
--- a/tests/functionaltests/proftest.h
+++ b/tests/functionaltests/proftest.h
@@ -1,15 +1,8 @@
 #ifndef __H_PROFTEST
 #define __H_PROFTEST

-/*
- * XDG paths are dynamic and generated per-test based on stub_port.
- * Each test instance uses unique directories (./tests/functionaltests/files/{port}/xdg_*)
- * to allow parallel test execution without file conflicts.
- */
-extern char xdg_config_home[256];
-extern char xdg_data_home[256];
-
-extern int stub_port;
+#define XDG_CONFIG_HOME "./tests/functionaltests/files/xdg_config_home"
+#define XDG_DATA_HOME   "./tests/functionaltests/files/xdg_data_home"

 int init_prof_test(void **state);
 int close_prof_test(void **state);
--- a/tests/functionaltests/test_carbons.c
+++ b/tests/functionaltests/test_carbons.c
@@ -4,6 +4,7 @@
 #include <string.h>

 #include <stabber.h>
+#include <expect.h>

 #include "proftest.h"

--- a/tests/functionaltests/test_chat_session.c
+++ b/tests/functionaltests/test_chat_session.c
@@ -1,10 +1,10 @@
 #include <glib.h>
-#include <unistd.h>
 #include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>

 #include <stabber.h>
+#include <expect.h>

 #include "proftest.h"

@@ -144,11 +144,7 @@ resets_to_barejid_after_presence_received(void **state)
            "<show>dnd</show>"
        "</presence>"
    );
-    // Wait for presence to be processed before sending next message.
-    // The presence output may appear in console or chat window depending on focus,
-    // so we use a small delay to ensure the session is reset to barejid.
-    // Under Valgrind, processing is slower, so this delay is necessary.
-    g_usleep(500000); // 500ms
+    assert_true(prof_output_exact("Buddy1 (laptop) is dnd"));

    prof_input("/msg buddy1@localhost Outgoing 2");
    assert_true(stbbr_received(
--- a/tests/functionaltests/test_connect.c
+++ b/tests/functionaltests/test_connect.c
@@ -2,9 +2,9 @@
 #include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>

 #include <stabber.h>
+#include <expect.h>

 #include "proftest.h"

@@ -47,9 +47,7 @@ connect_jid_requests_bookmarks(void **state)
 void
 connect_bad_password(void **state)
 {
-    char connect_cmd[128];
-    snprintf(connect_cmd, sizeof(connect_cmd), "/connect stabber@localhost server 127.0.0.1 port %d tls allow", stub_port);
-    prof_input(connect_cmd);
+    prof_input("/connect stabber@localhost server 127.0.0.1 port 5230 tls allow");
    prof_input("badpassword");

    assert_true(prof_output_exact("Login failed."));
--- a/tests/functionaltests/test_disconnect.c
+++ b/tests/functionaltests/test_disconnect.c
@@ -4,6 +4,7 @@
 #include <string.h>

 #include <stabber.h>
+#include <expect.h>

 #include "proftest.h"

--- a/tests/functionaltests/test_message.c
+++ b/tests/functionaltests/test_message.c
@@ -4,6 +4,7 @@
 #include <string.h>

 #include <stabber.h>
+#include <expect.h>

 #include "proftest.h"

--- a/tests/functionaltests/test_muc.c
+++ b/tests/functionaltests/test_muc.c
@@ -1,21 +1,13 @@
 #include <glib.h>
-#include <unistd.h>
 #include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>

 #include <stabber.h>
+#include <expect.h>

 #include "proftest.h"

-/*
- * NOTE: We use prof_output_regex() throughout this file even for seemingly
- * exact strings because some output may include timestamps, color codes,
- * or other dynamic content depending on configuration. Using regex provides
- * more robust matching. For patterns without regex metacharacters, the
- * performance difference is negligible.
- */
-
 void
 sends_room_join(void **state)
 {
@@ -23,7 +15,7 @@ sends_room_join(void **state)

    prof_input("/join testroom@conference.localhost");

-    assert_true(stbbr_received(
+    assert_true(stbbr_last_received(
        "<presence id='*' to='testroom@conference.localhost/stabber'>"
            "<x xmlns='http://jabber.org/protocol/muc'/>"
            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
@@ -38,7 +30,7 @@ sends_room_join_with_nick(void **state)

    prof_input("/join testroom@conference.localhost nick testnick");

-    assert_true(stbbr_received(
+    assert_true(stbbr_last_received(
        "<presence id='*' to='testroom@conference.localhost/testnick'>"
            "<x xmlns='http://jabber.org/protocol/muc'/>"
            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
@@ -53,7 +45,7 @@ sends_room_join_with_password(void **state)

    prof_input("/join testroom@conference.localhost password testpassword");

-    assert_true(stbbr_received(
+    assert_true(stbbr_last_received(
        "<presence id='*' to='testroom@conference.localhost/stabber'>"
            "<x xmlns='http://jabber.org/protocol/muc'>"
                "<password>testpassword</password>"
@@ -70,7 +62,7 @@ sends_room_join_with_nick_and_password(void **state)

    prof_input("/join testroom@conference.localhost nick testnick password testpassword");

-    assert_true(stbbr_received(
+    assert_true(stbbr_last_received(
        "<presence id='*' to='testroom@conference.localhost/testnick'>"
            "<x xmlns='http://jabber.org/protocol/muc'>"
                "<password>testpassword</password>"
@@ -85,8 +77,8 @@ shows_role_and_affiliation_on_join(void **state)
 {
    prof_connect();

-    stbbr_for_presence_to("testroom@conference.localhost/stabber",
-        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
+    stbbr_for_id("prof_join_4",
+        "<presence id='prof_join_4' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
@@ -97,7 +89,7 @@ shows_role_and_affiliation_on_join(void **state)

    prof_input("/join testroom@conference.localhost");

-    assert_true(prof_output_regex("-> You have joined the room as stabber, role: participant, affiliation: none"));
+    assert_true(prof_output_exact("-> You have joined the room as stabber, role: participant, affiliation: none"));
 }

 void
@@ -105,8 +97,8 @@ shows_subject_on_join(void **state)
 {
    prof_connect();

-    stbbr_for_presence_to("testroom@conference.localhost/stabber",
-        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
+    stbbr_for_id("prof_join_4",
+        "<presence id='prof_join_4' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
@@ -116,7 +108,7 @@ shows_subject_on_join(void **state)
    );

    prof_input("/join testroom@conference.localhost");
-    assert_true(prof_output_regex("-> You have joined the room as stabber, role: participant, affiliation: none"));
+    assert_true(prof_output_exact("-> You have joined the room as stabber, role: participant, affiliation: none"));

    stbbr_send(
        "<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost'>"
@@ -133,8 +125,8 @@ shows_history_message(void **state)
 {
    prof_connect();

-    stbbr_for_presence_to("testroom@conference.localhost/stabber",
-        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
+    stbbr_for_id("prof_join_4",
+        "<presence id='prof_join_4' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
@@ -144,7 +136,7 @@ shows_history_message(void **state)
    );

    prof_input("/join testroom@conference.localhost");
-    assert_true(prof_output_regex("-> You have joined the room as stabber, role: participant, affiliation: none"));
+    assert_true(prof_output_exact("-> You have joined the room as stabber, role: participant, affiliation: none"));

    stbbr_send(
        "<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost/testoccupant'>"
@@ -154,9 +146,7 @@ shows_history_message(void **state)
        "</message>"
    );

-    prof_timeout(10);
-    assert_true(prof_output_regex("testoccupant:.*an old message"));
-    prof_timeout_reset();
+    assert_true(prof_output_regex("testoccupant: an old message"));
 }

 void
@@ -164,12 +154,8 @@ shows_occupant_join(void **state)
 {
    prof_connect();

-    // Enable MUC status messages to see occupant join/leave
-    prof_input("/presence room all");
-    assert_true(prof_output_regex("All presence updates will appear"));
-
-    stbbr_for_presence_to("testroom@conference.localhost/stabber",
-        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
+    stbbr_for_id("prof_join_4",
+        "<presence id='prof_join_4' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
@@ -179,7 +165,7 @@ shows_occupant_join(void **state)
    );

    prof_input("/join testroom@conference.localhost");
-    assert_true(prof_output_regex("-> You have joined the room as stabber, role: participant, affiliation: none"));
+    assert_true(prof_output_exact("-> You have joined the room as stabber, role: participant, affiliation: none"));

    stbbr_send(
        "<presence to='stabber@localhost/profanity' from='testroom@conference.localhost/testoccupant'>"
@@ -188,9 +174,8 @@ shows_occupant_join(void **state)
            "</x>"
        "</presence>"
    );
-    sleep(1);

-    assert_true(prof_output_regex("testoccupant has joined"));
+    assert_true(prof_output_exact("-> testoccupant has joined the room, role: participant, affiliation: none"));
 }

 void
@@ -198,8 +183,8 @@ shows_message(void **state)
 {
    prof_connect();

-    stbbr_for_presence_to("testroom@conference.localhost/stabber",
-        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
+    stbbr_for_id("prof_join_4",
+        "<presence id='prof_join_4' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
@@ -209,7 +194,7 @@ shows_message(void **state)
    );

    prof_input("/join testroom@conference.localhost");
-    assert_true(prof_output_regex("-> You have joined the room as stabber, role: participant, affiliation: none"));
+    assert_true(prof_output_exact("-> You have joined the room as stabber, role: participant, affiliation: none"));

    stbbr_send(
        "<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost/testoccupant'>"
@@ -225,8 +210,8 @@ shows_me_message_from_occupant(void **state)
 {
    prof_connect();

-    stbbr_for_presence_to("testroom@conference.localhost/stabber",
-        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
+    stbbr_for_id("prof_join_4",
+        "<presence id='prof_join_4' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
@@ -236,7 +221,7 @@ shows_me_message_from_occupant(void **state)
    );

    prof_input("/join testroom@conference.localhost");
-    assert_true(prof_output_regex("-> You have joined the room as stabber, role: participant, affiliation: none"));
+    assert_true(prof_output_exact("-> You have joined the room as stabber, role: participant, affiliation: none"));

    stbbr_send(
        "<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost/testoccupant'>"
@@ -244,7 +229,7 @@ shows_me_message_from_occupant(void **state)
        "</message>"
    );

-    assert_true(prof_output_regex("\\*testoccupant did something"));
+    assert_true(prof_output_exact("*testoccupant did something"));
 }

 void
@@ -252,8 +237,8 @@ shows_me_message_from_self(void **state)
 {
    prof_connect();

-    stbbr_for_presence_to("testroom@conference.localhost/stabber",
-        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
+    stbbr_for_id("prof_join_4",
+        "<presence id='prof_join_4' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
@@ -263,7 +248,7 @@ shows_me_message_from_self(void **state)
    );

    prof_input("/join testroom@conference.localhost");
-    assert_true(prof_output_regex("-> You have joined the room as stabber, role: participant, affiliation: none"));
+    assert_true(prof_output_exact("-> You have joined the room as stabber, role: participant, affiliation: none"));

    stbbr_send(
        "<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
@@ -271,7 +256,7 @@ shows_me_message_from_self(void **state)
        "</message>"
    );

-    assert_true(prof_output_regex("\\*stabber did something"));
+    assert_true(prof_output_exact("*stabber did something"));
 }

 void
@@ -279,8 +264,8 @@ shows_all_messages_in_console_when_window_not_focussed(void **state)
 {
    prof_connect();

-    stbbr_for_presence_to("testroom@conference.localhost/stabber",
-        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
+    stbbr_for_id("prof_join_4",
+        "<presence id='prof_join_4' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
@@ -290,10 +275,10 @@ shows_all_messages_in_console_when_window_not_focussed(void **state)
    );

    prof_input("/join testroom@conference.localhost");
-    assert_true(prof_output_regex("-> You have joined the room as stabber, role: participant, affiliation: none"));
+    assert_true(prof_output_exact("-> You have joined the room as stabber, role: participant, affiliation: none"));

    prof_input("/win 1");
-    assert_true(prof_output_regex("CProof\\. Type /help for help information\\."));
+    assert_true(prof_output_exact("CProof. Type /help for help information."));

    stbbr_send(
        "<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost/testoccupant'>"
@@ -301,7 +286,7 @@ shows_all_messages_in_console_when_window_not_focussed(void **state)
        "</message>"
    );

-    assert_true(prof_output_regex("<< room message: testoccupant in testroom@conference\\.localhost \\(win 2\\)"));
+    assert_true(prof_output_exact("<< room message: testoccupant in testroom@conference.localhost (win 2)"));

    stbbr_send(
        "<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost/anotheroccupant'>"
@@ -309,7 +294,7 @@ shows_all_messages_in_console_when_window_not_focussed(void **state)
        "</message>"
    );

-    assert_true(prof_output_regex("<< room message: anotheroccupant in testroom@conference\\.localhost \\(win 2\\)"));
+    assert_true(prof_output_exact("<< room message: anotheroccupant in testroom@conference.localhost (win 2)"));
 }

 void
@@ -318,10 +303,10 @@ shows_first_message_in_console_when_window_not_focussed(void **state)
    prof_connect();

    prof_input("/console muc first");
-    assert_true(prof_output_regex("Console MUC messages set: first"));
+    assert_true(prof_output_exact("Console MUC messages set: first"));

-    stbbr_for_presence_to("testroom@conference.localhost/stabber",
-        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
+    stbbr_for_id("prof_join_4",
+        "<presence id='prof_join_4' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
@@ -331,22 +316,21 @@ shows_first_message_in_console_when_window_not_focussed(void **state)
    );

    prof_input("/join testroom@conference.localhost");
-    assert_true(prof_output_regex("-> You have joined the room as stabber, role: participant, affiliation: none"));
+    assert_true(prof_output_exact("-> You have joined the room as stabber, role: participant, affiliation: none"));

    prof_input("/win 1");
-    assert_true(prof_output_regex("CProof\\. Type /help for help information\\."));
+    assert_true(prof_output_exact("CProof. Type /help for help information."));

    stbbr_send(
        "<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost/testoccupant'>"
            "<body>a new message</body>"
        "</message>"
    );
-    sleep(1);

-    assert_true(prof_output_regex("room message.*testroom@conference\\.localhost"));
+    assert_true(prof_output_exact("<< room message: testroom@conference.localhost (win 2)"));
    prof_input("/clear");
    prof_input("/about");
-    assert_true(prof_output_regex("Type '/help' to show complete help\\."));
+    assert_true(prof_output_exact("Type '/help' to show complete help."));

    stbbr_send(
        "<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost/anotheroccupant'>"
@@ -355,7 +339,7 @@ shows_first_message_in_console_when_window_not_focussed(void **state)
    );

    prof_timeout(2);
-    assert_false(prof_output_regex("<< room message: testroom@conference\\.localhost \\(win 2\\)"));
+    assert_false(prof_output_exact("<< room message: testroom@conference.localhost (win 2)"));
    prof_timeout_reset();
 }

@@ -365,10 +349,10 @@ shows_no_message_in_console_when_window_not_focussed(void **state)
    prof_connect();

    prof_input("/console muc none");
-    assert_true(prof_output_regex("Console MUC messages set: none"));
+    assert_true(prof_output_exact("Console MUC messages set: none"));

-    stbbr_for_presence_to("testroom@conference.localhost/stabber",
-        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
+    stbbr_for_id("prof_join_4",
+        "<presence id='prof_join_4' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
            "<x xmlns='http://jabber.org/protocol/muc#user'>"
                "<item role='participant' jid='stabber@localhost/profanity' affiliation='none'/>"
@@ -378,10 +362,10 @@ shows_no_message_in_console_when_window_not_focussed(void **state)
    );

    prof_input("/join testroom@conference.localhost");
-    assert_true(prof_output_regex("-> You have joined the room as stabber, role: participant, affiliation: none"));
+    assert_true(prof_output_exact("-> You have joined the room as stabber, role: participant, affiliation: none"));

    prof_input("/win 1");
-    assert_true(prof_output_regex("CProof\\. Type /help for help information\\."));
+    assert_true(prof_output_exact("CProof. Type /help for help information."));

    stbbr_send(
        "<message type='groupchat' to='stabber@localhost/profanity' from='testroom@conference.localhost/testoccupant'>"
@@ -390,6 +374,6 @@ shows_no_message_in_console_when_window_not_focussed(void **state)
    );

    prof_timeout(2);
-    assert_false(prof_output_regex("testroom@conference\\.localhost \\(win 2\\)"));
+    assert_false(prof_output_exact("testroom@conference.localhost (win 2)"));
    prof_timeout_reset();
 }
--- a/tests/functionaltests/test_ping.c
+++ b/tests/functionaltests/test_ping.c
@@ -2,26 +2,17 @@
 #include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>

 #include <stabber.h>
+#include <expect.h>

 #include "proftest.h"

 void
 ping_server(void **state)
 {
-    /*
-     * This test verifies that profanity correctly handles the /ping command
-     * when the server supports ping (urn:xmpp:ping feature).
-     * 
-     * We register disco#info response with ping support, then verify
-     * profanity sends ping and receives "Pinged server" confirmation.
-     */
-    
-    // Register disco#info response that includes ping support
-    stbbr_for_query("http://jabber.org/protocol/disco#info",
-        "<iq to='stabber@localhost/profanity' type='result' from='localhost'>"
+    stbbr_for_id("prof_disco_info_onconnect_2",
+        "<iq id='prof_disco_info_onconnect_2' to='stabber@localhost/profanity' type='result' from='localhost'>"
            "<query xmlns='http://jabber.org/protocol/disco#info'>"
                "<identity category='server' type='im' name='Prosody'/>"
                "<feature var='urn:xmpp:ping'/>"
@@ -29,33 +20,37 @@ ping_server(void **state)
        "</iq>"
    );

-    // Register ping response
-    stbbr_for_query("urn:xmpp:ping",
-        "<iq from='localhost' to='stabber@localhost/profanity' type='result'/>"
+    stbbr_for_id("prof_ping_4",
+        "<iq id='prof_ping_4' type='result' to='stabber@localhost/profanity'/>"
+    );
+    stbbr_for_id("prof_ping_5",
+        "<iq id='prof_ping_5' type='result' to='stabber@localhost/profanity'/>"
    );

    prof_connect();
-    
-    /*
-     * Wait for disco#info exchange to complete.
-     * TODO: Replace with proper wait mechanism (e.g., wait for capabilities
-     * to be cached). Currently we use sleep to ensure disco#info response
-     * is processed before sending /ping command.
-     */
-    sleep(3);

    prof_input("/ping");
-    
-    prof_timeout(10);
-    assert_true(prof_output_regex("Pinged server"));
-    prof_timeout_reset();
+    assert_true(stbbr_received(
+        "<iq id='prof_ping_4' type='get'>"
+            "<ping xmlns='urn:xmpp:ping'/>"
+        "</iq>"
+    ));
+    assert_true(prof_output_exact("Ping response from server"));
+
+    prof_input("/ping");
+    assert_true(stbbr_received(
+        "<iq id='prof_ping_5' type='get'>"
+            "<ping xmlns='urn:xmpp:ping'/>"
+        "</iq>"
+    ));
+    assert_true(prof_output_exact("Ping response from server"));
 }

 void
 ping_server_not_supported(void **state)
 {
-    stbbr_for_query("http://jabber.org/protocol/disco#info",
-        "<iq to='stabber@localhost/profanity' type='result' from='localhost'>"
+    stbbr_for_id("prof_disco_info_onconnect_2",
+        "<iq id='prof_disco_info_onconnect_2' to='stabber@localhost/profanity' type='result' from='localhost'>"
            "<query xmlns='http://jabber.org/protocol/disco#info'>"
                "<identity category='server' type='im' name='Stabber'/>"
            "</query>"
@@ -65,7 +60,7 @@ ping_server_not_supported(void **state)
    prof_connect();

    prof_input("/ping");
-    assert_true(prof_output_regex("Server does not support ping requests"));
+    assert_true(prof_output_exact("Server does not support ping requests."));
 }

 void
@@ -74,21 +69,20 @@ ping_responds_to_server_request(void **state)
    prof_connect();

    stbbr_send(
-        "<iq id=\"pingtest1\" type=\"get\" to=\"stabber@localhost/profanity\" from=\"localhost\">"
-            "<ping xmlns=\"urn:xmpp:ping\"/>"
+        "<iq id='pingtest1' type='get' to='stabber@localhost/profanity' from='localhost'>"
+            "<ping xmlns='urn:xmpp:ping'/>"
        "</iq>"
    );

    assert_true(stbbr_received(
-        "<iq id='pingtest1' type='result' from='stabber@localhost/profanity' to='localhost'></iq>"
+        "<iq id='pingtest1' type='result' from='stabber@localhost/profanity' to='localhost'/>"
    ));
 }

 void ping_jid(void **state)
 {
-    // Caps/disco info response without relying on a fixed id
-    stbbr_for_query("http://jabber.org/protocol/disco#info",
-        "<iq to='stabber@localhost/profanity' type='result' from='buddy1@localhost/mobile'>"
+    stbbr_for_id("prof_caps_4",
+        "<iq id='prof_caps_4' to='stabber@localhost/profanity' type='result' from='buddy1@localhost/mobile'>"
            "<query xmlns='http://jabber.org/protocol/disco#info' node='http://profanity-im.github.io#LpT2xs3nun7jC2sq4gg3WRDQFZ4='>"
                "<identity category='client' type='console' name='Profanity0.6.0'/>"
                "<feature var='urn:xmpp:ping'/>"
@@ -115,30 +109,29 @@ void ping_jid(void **state)
    assert_true(prof_output_exact("Buddy1 (mobile) is online, \"I'm here\""));

    assert_true(stbbr_received(
-        "<iq id='*' to='buddy1@localhost/mobile' type='get'>"
+        "<iq id='prof_caps_4' to='buddy1@localhost/mobile' type='get'>"
            "<query xmlns='http://jabber.org/protocol/disco#info' node='http://profanity-im.github.io#LpT2xs3nun7jC2sq4gg3WRDQFZ4='/>"
        "</iq>"
    ));

-    // Respond to ping result regardless of id
-    stbbr_for_query("urn:xmpp:ping",
-        "<iq from='buddy1@localhost/mobile' to='stabber@localhost' type='result'/>"
+    stbbr_for_id("prof_ping_5",
+        "<iq from='buddy1@localhost/mobile' to='stabber@localhost' id='prof_ping_5' type='result'/>"
    );

    prof_input("/ping buddy1@localhost/mobile");

    assert_true(stbbr_received(
-        "<iq id='*' type='get' to='buddy1@localhost/mobile'>"
+        "<iq id='prof_ping_5' type='get' to='buddy1@localhost/mobile'>"
            "<ping xmlns='urn:xmpp:ping'/>"
        "</iq>"
    ));
-    assert_true(prof_output_regex("Ping response from buddy1@localhost/mobile"));
+    assert_true(prof_output_exact("Ping response from buddy1@localhost/mobile"));
 }

 void ping_jid_not_supported(void **state)
 {
-    stbbr_for_query("http://jabber.org/protocol/disco#info",
-        "<iq to='stabber@localhost/profanity' type='result' from='buddy1@localhost/mobile'>"
+    stbbr_for_id("prof_caps_4",
+        "<iq id='prof_caps_4' to='stabber@localhost/profanity' type='result' from='buddy1@localhost/mobile'>"
            "<query xmlns='http://jabber.org/protocol/disco#info' node='http://profanity-im.github.io#LpT2xs3nun7jC2sq4gg3WRDQFZ4='>"
                "<identity category='client' type='console' name='Profanity0.6.0'/>"
                "<feature var='http://jabber.org/protocol/disco#info'/>"
@@ -164,7 +157,7 @@ void ping_jid_not_supported(void **state)
    assert_true(prof_output_exact("Buddy1 (mobile) is online, \"I'm here\""));

    assert_true(stbbr_received(
-        "<iq id='*' to='buddy1@localhost/mobile' type='get'>"
+        "<iq id='prof_caps_4' to='buddy1@localhost/mobile' type='get'>"
            "<query xmlns='http://jabber.org/protocol/disco#info' node='http://profanity-im.github.io#LpT2xs3nun7jC2sq4gg3WRDQFZ4='/>"
        "</iq>"
    ));
--- a/tests/functionaltests/test_presence.c
+++ b/tests/functionaltests/test_presence.c
@@ -4,6 +4,7 @@
 #include <string.h>

 #include <stabber.h>
+#include <expect.h>

 #include "proftest.h"

@@ -12,16 +13,15 @@ presence_online(void **state)
 {
    prof_connect();

-    prof_input("/status set online");
-
-    assert_true(prof_output_exact("Status set to online (priority 0), \"online\"."));
+    prof_input("/online");

    assert_true(stbbr_received(
-        "<presence id='*'>"
-            "<status>online</status>"
+        "<presence id='prof_presence_3'>"
            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
+
+    assert_true(prof_output_exact("Status set to online (priority 0)"));
 }

 void
@@ -29,16 +29,16 @@ presence_online_with_message(void **state)
 {
    prof_connect();

-    prof_input("/status set online \"Hi there\"");
-
-    assert_true(prof_output_exact("Status set to online (priority 0), \"Hi there\"."));
+    prof_input("/online \"Hi there\"");

    assert_true(stbbr_received(
-        "<presence id='*'>"
+        "<presence id='prof_presence_4'>"
            "<status>Hi there</status>"
            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
+
+    assert_true(prof_output_exact("Status set to online (priority 0), \"Hi there\"."));
 }

 void
@@ -46,17 +46,16 @@ presence_away(void **state)
 {
    prof_connect();

-    prof_input("/status set away");
-
-    assert_true(prof_output_exact("Status set to away (priority 0), \"away\"."));
+    prof_input("/away");

    assert_true(stbbr_received(
-        "<presence id='*'>"
+        "<presence id='prof_presence_4'>"
            "<show>away</show>"
-            "<status>away</status>"
            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
+
+    assert_true(prof_output_exact("Status set to away (priority 0)"));
 }

 void
@@ -64,17 +63,17 @@ presence_away_with_message(void **state)
 {
    prof_connect();

-    prof_input("/status set away \"I'm not here for a bit\"");
-
-    assert_true(prof_output_exact("Status set to away (priority 0), \"I'm not here for a bit\"."));
+    prof_input("/away \"I'm not here for a bit\"");

    assert_true(stbbr_received(
-        "<presence id='*'>"
+        "<presence id='prof_presence_4'>"
            "<show>away</show>"
            "<status>I'm not here for a bit</status>"
            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
+
+    assert_true(prof_output_exact("Status set to away (priority 0), \"I'm not here for a bit\"."));
 }

 void
@@ -82,17 +81,16 @@ presence_xa(void **state)
 {
    prof_connect();

-    prof_input("/status set xa");
-
-    assert_true(prof_output_exact("Status set to xa (priority 0), \"xa\"."));
+    prof_input("/xa");

    assert_true(stbbr_received(
-        "<presence id='*'>"
+        "<presence id='prof_presence_4'>"
            "<show>xa</show>"
-            "<status>xa</status>"
            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
+
+    assert_true(prof_output_exact("Status set to xa (priority 0)"));
 }

 void
@@ -100,17 +98,17 @@ presence_xa_with_message(void **state)
 {
    prof_connect();

-    prof_input("/status set xa \"Gone to the shops\"");
-
-    assert_true(prof_output_exact("Status set to xa (priority 0), \"Gone to the shops\"."));
+    prof_input("/xa \"Gone to the shops\"");

    assert_true(stbbr_received(
-        "<presence id='*'>"
+        "<presence id='prof_presence_4'>"
            "<show>xa</show>"
            "<status>Gone to the shops</status>"
            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
+
+    assert_true(prof_output_exact("Status set to xa (priority 0), \"Gone to the shops\"."));
 }

 void
@@ -118,17 +116,16 @@ presence_dnd(void **state)
 {
    prof_connect();

-    prof_input("/status set dnd");
-
-    assert_true(prof_output_exact("Status set to dnd (priority 0), \"dnd\"."));
+    prof_input("/dnd");

    assert_true(stbbr_received(
-        "<presence id='*'>"
+        "<presence id='prof_presence_4'>"
            "<show>dnd</show>"
-            "<status>dnd</status>"
            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
+
+    assert_true(prof_output_exact("Status set to dnd (priority 0)"));
 }

 void
@@ -136,17 +133,17 @@ presence_dnd_with_message(void **state)
 {
    prof_connect();

-    prof_input("/status set dnd \"Working\"");
-
-    assert_true(prof_output_exact("Status set to dnd (priority 0), \"Working\"."));
+    prof_input("/dnd \"Working\"");

    assert_true(stbbr_received(
-        "<presence id='*'>"
+        "<presence id='prof_presence_4'>"
            "<show>dnd</show>"
            "<status>Working</status>"
            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
+
+    assert_true(prof_output_exact("Status set to dnd (priority 0), \"Working\"."));
 }

 void
@@ -154,17 +151,16 @@ presence_chat(void **state)
 {
    prof_connect();

-    prof_input("/status set chat");
-
-    assert_true(prof_output_exact("Status set to chat (priority 0), \"chat\"."));
+    prof_input("/chat");

    assert_true(stbbr_received(
-        "<presence id='*'>"
+        "<presence id='prof_presence_4'>"
            "<show>chat</show>"
-            "<status>chat</status>"
            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
+
+    assert_true(prof_output_exact("Status set to chat (priority 0)"));
 }

 void
@@ -172,17 +168,17 @@ presence_chat_with_message(void **state)
 {
    prof_connect();

-    prof_input("/status set chat \"Free to talk\"");
-
-    assert_true(prof_output_exact("Status set to chat (priority 0), \"Free to talk\"."));
+    prof_input("/chat \"Free to talk\"");

    assert_true(stbbr_received(
-        "<presence id='*'>"
+        "<presence id='prof_presence_4'>"
            "<show>chat</show>"
            "<status>Free to talk</status>"
            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
+
+    assert_true(prof_output_exact("Status set to chat (priority 0), \"Free to talk\"."));
 }

 void
@@ -192,14 +188,14 @@ presence_set_priority(void **state)

    prof_input("/priority 25");

-    assert_true(prof_output_exact("Priority set to 25."));
-
    assert_true(stbbr_received(
-        "<presence id='*'>"
+        "<presence id='prof_presence_4'>"
            "<priority>25</priority>"
            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
+
+    assert_true(prof_output_exact("Priority set to 25."));
 }

 void
@@ -208,24 +204,24 @@ presence_includes_priority(void **state)
    prof_connect();

    prof_input("/priority 25");
-    assert_true(prof_output_exact("Priority set to 25."));
    assert_true(stbbr_received(
-        "<presence id='*'>"
+        "<presence id='prof_presence_4'>"
            "<priority>25</priority>"
            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
+    assert_true(prof_output_exact("Priority set to 25."));

-    prof_input("/status set chat \"Free to talk\"");
-    assert_true(prof_output_exact("Status set to chat (priority 25), \"Free to talk\"."));
+    prof_input("/chat \"Free to talk\"");
    assert_true(stbbr_received(
-        "<presence id='*'>"
+        "<presence id='prof_presence_5'>"
            "<priority>25</priority>"
            "<show>chat</show>"
            "<status>Free to talk</status>"
            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
+    assert_true(prof_output_exact("Status set to chat (priority 25), \"Free to talk\"."));
 }

 void
@@ -233,26 +229,26 @@ presence_keeps_status(void **state)
 {
    prof_connect();

-    prof_input("/status set chat \"Free to talk\"");
-    assert_true(prof_output_exact("Status set to chat (priority 0), \"Free to talk\"."));
+    prof_input("/chat \"Free to talk\"");
    assert_true(stbbr_received(
-        "<presence id='*'>"
+        "<presence id='prof_presence_4'>"
            "<show>chat</show>"
            "<status>Free to talk</status>"
            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
+    assert_true(prof_output_exact("Status set to chat (priority 0), \"Free to talk\"."));

    prof_input("/priority 25");
-    assert_true(prof_output_exact("Priority set to 25."));
    assert_true(stbbr_received(
-        "<presence id='*'>"
+        "<presence id='prof_presence_5'>"
            "<show>chat</show>"
            "<status>Free to talk</status>"
            "<priority>25</priority>"
            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' ver='*' node='http://profanity-im.github.io'/>"
        "</presence>"
    ));
+    assert_true(prof_output_exact("Priority set to 25."));
 }

 void
--- a/tests/functionaltests/test_receipts.c
+++ b/tests/functionaltests/test_receipts.c
@@ -4,6 +4,7 @@
 #include <string.h>

 #include <stabber.h>
+#include <expect.h>

 #include "proftest.h"

@@ -30,9 +31,8 @@ send_receipt_request(void **state)

    prof_connect();

-    // Register disco#info response for capabilities query (receipts support)
-    stbbr_for_query("http://jabber.org/protocol/disco#info",
-        "<iq from='buddy1@localhost/laptop' to='stabber@localhost' id='*' type='result'>"
+    stbbr_for_id("prof_caps_4",
+        "<iq from='buddy1@localhost/laptop' to='stabber@localhost' id='prof_caps_4' type='result'>"
            "<query xmlns='http://jabber.org/protocol/disco#info' node='http://profanity-im.github.io#hAkb1xZdJV9BQpgGNw8zG5Xsals='>"
                "<identity category='client' name='Profanity 0.5.0' type='console'/>"
                "<feature var='urn:xmpp:receipts'/>"
--- a/tests/functionaltests/test_rooms.c
+++ b/tests/functionaltests/test_rooms.c
@@ -4,14 +4,15 @@
 #include <string.h>

 #include <stabber.h>
+#include <expect.h>

 #include "proftest.h"

 void
 rooms_query(void **state)
 {
-    stbbr_for_query("http://jabber.org/protocol/disco#items",
-        "<iq id='*' type='result' to='stabber@localhost/profanity' from='conference.localhost'>"
+    stbbr_for_id("prof_confreq_4",
+        "<iq id='prof_confreq_4' type='result' to='stabber@localhost/profanity' from='conference.localhost'>"
            "<query xmlns='http://jabber.org/protocol/disco#items'>"
                "<item jid='chatroom@conference.localhost' name='A chat room'/>"
                "<item jid='hangout@conference.localhost' name='Another chat room'/>"
@@ -26,8 +27,8 @@ rooms_query(void **state)
    assert_true(prof_output_exact("chatroom@conference.localhost (A chat room)"));
    assert_true(prof_output_exact("hangout@conference.localhost (Another chat room)"));

-    assert_true(stbbr_received(
-        "<iq id='*' to='conference.localhost' type='get'>"
+    assert_true(stbbr_last_received(
+        "<iq id='prof_confreq_4' to='conference.localhost' type='get'>"
            "<query xmlns='http://jabber.org/protocol/disco#items'/>"
        "</iq>"
    ));
--- a/tests/functionaltests/test_roster.c
+++ b/tests/functionaltests/test_roster.c
@@ -4,6 +4,7 @@
 #include <string.h>

 #include <stabber.h>
+#include <expect.h>

 #include "proftest.h"

--- a/tests/functionaltests/test_software.c
+++ b/tests/functionaltests/test_software.c
@@ -4,6 +4,7 @@
 #include <string.h>

 #include <stabber.h>
+#include <expect.h>

 #include "proftest.h"
Author	SHA1	Message	Date
jabber.developer2	b7a38f1e34	refactor: optimize hash table iterations and fix security issues #58 All checks were successful CI Code / Check spelling (pull_request) Successful in 21s Details CI Code / Check coding style (pull_request) Successful in 36s Details CI Code / Linux (arch) (pull_request) Successful in 10m15s Details CI Code / Linux (ubuntu) (pull_request) Successful in 13m57s Details CI Code / Linux (debian) (pull_request) Successful in 16m17s Details - refactor(core): replace g_hash_table_get_keys with g_hash_table_iter_init * Eliminates temporary GList allocations * Improves iteration performance * Affected: connection.c, cmd_defs.c, cmd_funcs.c, omemo.c, gpg.c, disco.c, form.c, autocompleters.c, capabilities.c, callbacks.c - fix(xmpp): correct queued_messages loop in connection.c:1031 * Remove incorrect NULL check that prevented message storage * calloc zeros array, causing loop to skip immediately * Fixes dropped messages during reconnection with SM enabled - fix(ui): prevent format string vulnerabilities in cons_show calls * Replace cons_show(variable) with cons_show("%s", variable) * Protects against format string attacks if variables contain % * Updated instances across cmd_funcs.c, connection.c, ox.c, console.c, core.c	2025-11-10 18:51:16 +03:00
jabber.developer2	33952c1331	fix: Refactor src/command/cmd_defs.c for metrics fix All checks were successful CI Code / Check spelling (pull_request) Successful in 19s Details CI Code / Check coding style (pull_request) Successful in 36s Details CI Code / Linux (ubuntu) (pull_request) Successful in 15m35s Details CI Code / Linux (debian) (pull_request) Successful in 17m52s Details CI Code / Linux (arch) (pull_request) Successful in 9m23s Details	2025-11-10 15:29:18 +03:00
jabber.developer2	5f01f8f546	feat(ui,db,cmd): reduce dublicate code in window subwin logic, unify SQLite helpers, NULL checks added Some checks failed CI Code / Check spelling (pull_request) Successful in 18s Details CI Code / Linux (arch) (pull_request) Failing after 22s Details CI Code / Check coding style (pull_request) Failing after 31s Details CI Code / Linux (debian) (pull_request) Successful in 15m14s Details CI Code / Linux (ubuntu) (pull_request) Successful in 15m36s Details window.c: add _get_subwin_cols, _apply_split_resize, _check_subwin_width; refactor show/hide/resize/refresh/update database.c: add _db_prepare_ctx, _db_teardown; safer init/queries with fallback timestamp cmd_defs.c: guard fopen in docgen; inputwin.c: replace assert with runtime check	2025-11-10 15:09:09 +03:00
jabber.developer2	332cd243c6	fix(ui,db): harden NULL handling and resource lifecycle across UI and SQLite Some checks failed CI Code / Linux (arch) (pull_request) Failing after 20s Details CI Code / Check spelling (pull_request) Successful in 24s Details CI Code / Check coding style (pull_request) Failing after 36s Details CI Code / Linux (ubuntu) (pull_request) Successful in 15m27s Details CI Code / Linux (debian) (pull_request) Successful in 17m51s Details ui/window: fix subwindow lifecycle (safe delwin on recreate), clamp widths, add fallback timestamp when loading history to avoid NULL deref ui/buffer: add GSList bounds checks; assert non-NULL timestamps when creating entries ui/titlebar: guard newwin failures; make draw/resize/free no-ops when window is NULL ui/statusbar: guard window creation/resize/close; clamp columns; fallback display name if JID parsing fails ui/inputwin: check newpad result; guard resize/getters/close on NULL; safe delwin ui/chatwin: guard buffer_get_entry/time before ISO8601 formatting ui/window_list: validate win_create_* results; don’t insert NULL windows; fix barejid leak in wins_get_by_string db/database: ensure cleanup on sqlite init/open failures; use sqlite3_close_v2 and warn if busy; always return a ProfMessage from log_database_get_limits_info and set current UTC timestamp when is_last with no row; initialize err_msg and free consistently; improve error messages Prevents crashes from NULL dereferences (e.g., during MAM history) and closes small leaks; improves robustness under OOM and allocation failures.	2025-11-05 14:39:10 +03:00