blob: 066291d65ab43b20c76bda88cb189bb69bc1502b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
Description: scanimage assert failure: *** Error in `scanimage': double free or corruption (top)
Author: Laurent Vivier Laurent@vivier.eu
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/sane-backends/+bug/1208091
Forwarded: not needed
Last-Update: 2017-06-20
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: trunk/backend/net.c
===================================================================
--- trunk.orig/backend/net.c
+++ trunk/backend/net.c
@@ -964,10 +964,6 @@ sane_init (SANE_Int * version_code, SANE
first_device = NULL;
first_handle = NULL;
-#ifdef WITH_AVAHI
- net_avahi_init ();
-#endif /* WITH_AVAHI */
-
auth_callback = authorize;
/* Return the version number of the sane-backends package to allow
@@ -1119,6 +1115,10 @@ sane_init (SANE_Int * version_code, SANE
DBG (2, "sane_init: connect timeout set to %d seconds from env\n", connect_timeout);
}
+#ifdef WITH_AVAHI
+ net_avahi_init ();
+#endif /* WITH_AVAHI */
+
DBG (2, "sane_init: done\n");
return SANE_STATUS_GOOD;
}
|
