Merge pull request #13659 from donaldsharp/increase_mgmt_time

[mirror_frr.git] / lib / elf_py.c

diff --git a/lib/elf_py.c b/lib/elf_py.c
index 5289faece4eb920eed202795cd4d9d8fa2df91e4..d473dc10cbf0ece5eeb465f419bec8a768e5d235 100644 (file)
--- a/lib/elf_py.c
+++ b/lib/elf_py.c
@@ -1,20 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * fast ELF file accessor
  * Copyright (C) 2018-2020  David Lamparter for NetDEF, Inc.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /* Note: this wrapper is intended to be used as build-time helper.  While
@@ -50,10 +37,10 @@
 
 #define PY_SSIZE_T_CLEAN
 
-#include <Python.h>
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include <Python.h>
 #include "structmember.h"
 #include <string.h>
 #include <stdlib.h>
@@ -293,7 +280,7 @@ static PyObject *elfreloc_getsection(PyObject *self, PyObject *args)
        if (!w->es)
                Py_RETURN_NONE;
 
-       if (w->symidx == 0) {
+       if (!w->symvalid || w->symidx == 0) {
                size_t idx = 0;
                Elf_Scn *scn;
 
@@ -1153,7 +1140,8 @@ static PyObject *elffile_load(PyTypeObject *type, PyObject *args,
        fd = open(filename, O_RDONLY | O_NOCTTY);
        if (fd < 0 || fstat(fd, &st)) {
                PyErr_SetFromErrnoWithFilename(PyExc_OSError, filename);
-               close(fd);
+               if (fd > 0)
+                       close(fd);
                goto out;
        }
        w->len = st.st_size;