avoid segfaults

diff --git a/backends/nss.c b/backends/nss.c
index cad3988c884021115611fc985bf8ed0640dbaa91..e4524f530de12866166516511275f48a099474c2 100644 (file)
--- a/backends/nss.c
+++ b/backends/nss.c
@@ -129,10 +129,10 @@ start(netresolve_backend_t resolver, char **settings)
                netresolve_backend_failed(resolver);
                return;
        }
-       try_symbol_pattern(resolver, priv, (void *) priv->gethostbyname_r, "_nss_%s_gethostbyname_r", "gethostbyname");
-       try_symbol_pattern(resolver, priv, (void *) priv->gethostbyname2_r, "_nss_%s_gethostbyname2_r", "gethostbyname2");
-       try_symbol_pattern(resolver, priv, (void *) priv->gethostbyname3_r, "_nss_%s_gethostbyname3_r", "gethostbyname3");
-       try_symbol_pattern(resolver, priv, (void *) priv->gethostbyname4_r, "_nss_%s_gethostbyname4_r", "gethostbyname4");
+       try_symbol_pattern(resolver, priv, (void *) &priv->gethostbyname_r, "_nss_%s_gethostbyname_r", "gethostbyname");
+       try_symbol_pattern(resolver, priv, (void *) &priv->gethostbyname2_r, "_nss_%s_gethostbyname2_r", "gethostbyname2");
+       try_symbol_pattern(resolver, priv, (void *) &priv->gethostbyname3_r, "_nss_%s_gethostbyname3_r", "gethostbyname3");
+       try_symbol_pattern(resolver, priv, (void *) &priv->gethostbyname4_r, "_nss_%s_gethostbyname4_r", "gethostbyname4");
 
        /*if (priv->gethostbyname4_r) {
                TODO

diff --git a/lib/backend.c b/lib/backend.c
index 92c2a3e2c295da4382dba908986342d381c7438d..3540957d805ee5fa75cfa976f72742f46cce08e6 100644 (file)
--- a/lib/backend.c
+++ b/lib/backend.c
@@ -202,7 +202,8 @@ backend_cleanup(netresolve_backend_t resolver)
        struct netresolve_backend *backend = *resolver->backend;
 
        if (backend && backend->data) {
-               backend->cleanup(resolver);
+               if (backend->cleanup)
+                       backend->cleanup(resolver);
                free(backend->data);
                backend->data = NULL;
        }