[tor-commits] [sandboxed-tor-browser/master] Bug 22038: Stub out `pa_start_child_for_read`.

[yawning at torproject.org]

commit 043ac0d0a89b5c9127c438a8153460acaabf38e9
Author: Yawning Angel <yawning at schwanenlied.me>
Date:   Fri Apr 21 12:32:23 2017 +0000

    Bug 22038: Stub out `pa_start_child_for_read`.
---
 ChangeLog               |  1 +
 src/tbb_stub/tbb_stub.c | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 0482499..2123c6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 Changes in version 0.0.7 - UNRELEASED:
+ * Bug 22038: Stub out `pa_start_child_for_read`.
 
 Changes in version 0.0.6 - 2017-04-19:
  * Add back the old release MAR signing key.
diff --git a/src/tbb_stub/tbb_stub.c b/src/tbb_stub/tbb_stub.c
index 5e33859..63f2d42 100644
--- a/src/tbb_stub/tbb_stub.c
+++ b/src/tbb_stub/tbb_stub.c
@@ -228,6 +228,26 @@ pa_mutex_new(bool recursive, bool inherit_priority) {
   return m;
 }
 
+/* This call appears to only be used as part of the `gconf` module to execute
+ * a hardcoded `gconf-helper`, and isn't exposed to IPC.  So leaving it in
+ * should be relatively harmless.  Might as well stub it out, though the
+ * utility of doing so is questionable, since nothing should call it.
+ *
+ * See: https://labs.riseup.net/code/issues/12325
+ */
+int
+pa_start_child_for_read(const char *name, const char *argv1, pid_t *pid)
+{
+#if 0
+  fprintf(stderr, "tbb_stub: pa_start_child_for_read(%s, %p, %p)\n", name, argv1, pid);
+#else
+  (void) name;
+  (void) argv1;
+  (void) pid;
+#endif
+  return -1;
+}
+
 /*  Initialize the stub. */
 static void
 stub_init(void)