summaryrefslogtreecommitdiff
path: root/print/hplip/files/patch-scan_sane_io.c
diff options
context:
space:
mode:
authorTijl Coosemans <tijl@FreeBSD.org>2021-08-25 15:29:51 +0200
committerTijl Coosemans <tijl@FreeBSD.org>2022-03-11 15:49:48 +0100
commit982e968ef61a94e0de75d733e9036e5c60afca34 (patch)
tree6beacb77eeac3d323af5c7e168890caa5c1fa2c8 /print/hplip/files/patch-scan_sane_io.c
parentdeskutils/virt-manager: update to 4.0.0 (diff)
print/hplip(-plugin): update to 3.22.2
- Convert post-patch to real patches because they are easier to maintain. - Fix a NULL dereference in the scanner backend when D-Bus isn't running. - Depend on sysutils/py-distro to make hp-toolbox (Device Manager) work again. - Upstream switched to Avahi for mDNS support. Rename the SNMP option to NETWORK because it's not just SNMP now. - Don't install some programs related to uninstalling and upgrading of HPLIP and the installation of firmware plugins because they circumvent the package system. - Install icons in share/icons so desktops can choose an appropriate resolution. Portions taken from a patch by Oleg Sidorkin <osidorkin@gmail.com>. PR: 255586, 257034, 257512
Diffstat (limited to 'print/hplip/files/patch-scan_sane_io.c')
-rw-r--r--print/hplip/files/patch-scan_sane_io.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/print/hplip/files/patch-scan_sane_io.c b/print/hplip/files/patch-scan_sane_io.c
new file mode 100644
index 000000000000..a4745da2a4db
--- /dev/null
+++ b/print/hplip/files/patch-scan_sane_io.c
@@ -0,0 +1,14 @@
+--- scan/sane/io.c.orig 2022-02-23 07:41:05 UTC
++++ scan/sane/io.c
+@@ -92,9 +92,10 @@ int __attribute__ ((visibility ("hidden"))) SendScanEv
+ DBUS_TYPE_STRING, &title,
+ DBUS_TYPE_INVALID);
+
+- if (!dbus_connection_send(dbus_conn, msg, NULL))
++ if (NULL == dbus_conn || !dbus_connection_send(dbus_conn, msg, NULL))
+ {
+ BUG("dbus message send failed!\n");
++ dbus_message_unref(msg);
+ return 0;
+ }
+