From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 24 Dec 2010 20:28:00 +0000 (+0000)
Subject: libs/lmo: apply FD_CLOEXEC on archive descriptors to avoid leaking i18n file fds... 
X-Git-Tag: 0.10.0~268
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f383dc0229138d7b9fce3280730c66d6f7c1b8f5;p=oweals%2Fluci.git

libs/lmo: apply FD_CLOEXEC on archive descriptors to avoid leaking i18n file fds into executed subprocesses
---

diff --git a/libs/lmo/src/lmo_core.c b/libs/lmo/src/lmo_core.c
index 6a9623aa9..08141383e 100644
--- a/libs/lmo/src/lmo_core.c
+++ b/libs/lmo/src/lmo_core.c
@@ -1,7 +1,7 @@
 /*
  * lmo - Lua Machine Objects - Base functions
  *
- *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+ *   Copyright (C) 2009-2010 Jo-Philipp Wich <xm@subsignal.org>
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -94,6 +94,8 @@ lmo_archive_t * lmo_open(const char *file)
 		ar->fd     = in;
 		ar->length = idx_offset;
 
+		fcntl(ar->fd, F_SETFD, fcntl(ar->fd, F_GETFD) | FD_CLOEXEC);
+
 		for( i = idx_offset;
 		     i < (s.st_size - sizeof(uint32_t));
 		     i += (4 * sizeof(uint32_t))
@@ -230,4 +232,3 @@ int lmo_lookup(lmo_archive_t *ar, const char *key, char *dest, int len)
 
 	return copy_len;
 }
-