X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_llist.c;h=4c5645b1cba12461c7811cc12c9b6e52a6e2c1da;hb=af6222065f1f5d8969afdde89c9f26a73e1e1690;hp=6a0c6f06411b76e7fa15083bb1d5fd850c9d48f0;hpb=6bd4bf7b21f84746010792b885b9b71791dccb79;p=collectd.git

diff --git a/src/utils_llist.c b/src/utils_llist.c
index 6a0c6f06..4c5645b1 100644
--- a/src/utils_llist.c
+++ b/src/utils_llist.c
@@ -12,10 +12,9 @@
  * ranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public Licence for more details.
  *
- * You should have received a copy of the GNU General Public
- * Licence along with this program; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
- * USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  *
  * Authors:
  *   Florian Forster <octo at verplant.org>
@@ -120,6 +119,9 @@ void llist_remove (llist_t *l, llentry_t *e)
 {
 	llentry_t *prev;
 
+	if ((l == NULL) || (e == NULL))
+		return;
+
 	prev = l->head;
 	while ((prev != NULL) && (prev->next != e))
 		prev = prev->next;