diff options
| author | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2008-12-02 08:47:17 (GMT) |
|---|---|---|
| committer | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2008-12-02 08:47:17 (GMT) |
| commit | d47538083130a89caa3463f5b6e779070b28de61 (patch) | |
| tree | 46d676398263a244e6251e712b661fe8ddb5c7bc | |
| parent | 95dac3b823bfa22e94795c4f5a5641227c8d0de3 (diff) | |
Fix one file descriptor leak
| -rw-r--r-- | src/olpc/datastore/filestore.py | 1 | ||||
| -rw-r--r-- | src/olpc/datastore/metadatareader.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/olpc/datastore/filestore.py b/src/olpc/datastore/filestore.py index 730c7ac..894c183 100644 --- a/src/olpc/datastore/filestore.py +++ b/src/olpc/datastore/filestore.py @@ -79,6 +79,7 @@ class FileStore(object): dir_path = layoutmanager.get_instance().get_entry_path(uid) file_path = os.path.join(dir_path, 'data') if not os.path.exists(file_path): + logging.debug('Entry %r doesnt have any file' % uid) return '' use_instance_dir = os.path.exists('/etc/olpc-security') and \ diff --git a/src/olpc/datastore/metadatareader.c b/src/olpc/datastore/metadatareader.c index f0cec93..08be17e 100644 --- a/src/olpc/datastore/metadatareader.c +++ b/src/olpc/datastore/metadatareader.c @@ -49,6 +49,9 @@ add_property(char *metadata_path, char *property_name, PyObject *dict, if (file_size == 0) { // Empty property + fclose(file); + file = NULL; + value = PyString_FromString(""); if (value == NULL) { PyErr_SetString(PyExc_ValueError, |