From f7de7843a6810f99763eeccd57fd27b80dc8a518 Mon Sep 17 00:00:00 2001 From: Iustin Pop Date: Fri, 13 May 2016 23:17:39 +0200 Subject: [PATCH] Imported Upstream version 0.5.4 --- Makefile | 3 ++- NEWS | 6 ++++++ PKG-INFO | 4 ++-- README | 4 ++-- doc/conf.py | 6 +++--- pyxattr.egg-info/PKG-INFO | 4 ++-- setup.py | 4 ++-- xattr.c | 7 ++++--- 8 files changed, 23 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 97cad8c..5a66261 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ dist: fakeroot ./setup.py sdist test: - @for ver in 2.4 2.5 2.6 2.7 3.0 3.1 3.2 3.3; do \ + @for ver in 2.4 2.5 2.6 2.7 3.0 3.1 3.2 3.3 3.4 3.5; do \ if type python$$ver >/dev/null; then \ echo Testing with python$$ver; \ python$$ver ./setup.py test -q; \ @@ -37,6 +37,7 @@ test: clean: rm -rf $(DOCHTML) $(DOCTREES) rm -f $(MODNAME) + rm -f *.so rm -rf build .PHONY: doc test clean dist diff --git a/NEWS b/NEWS index 06d2627..5dfdf0a 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,12 @@ News ==== +Version 0.5.4 +------------- + +Fix memory leaks on some of the error-handling paths of the `get()` +function. + Version 0.5.3 ------------- diff --git a/PKG-INFO b/PKG-INFO index 66b8fda..58725ce 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,10 +1,10 @@ Metadata-Version: 1.1 Name: pyxattr -Version: 0.5.3 +Version: 0.5.4 Summary: Filesystem extended attributes for python Home-page: http://pyxattr.k1024.org/ Author: Iustin Pop -Author-email: iusty@k1024.org +Author-email: iustin@k1024.org License: LGPL Download-URL: http://pyxattr.k1024.org/downloads/ Description: This is a C extension module for Python which diff --git a/README b/README index 492645d..bf1472c 100644 --- a/README +++ b/README @@ -6,7 +6,7 @@ to the extended attributes for filesystem objects available in some operating systems. Downloads: go to http://pyxattr.k1024.org/downloads/. Latest -version is 0.5.3. The source repository is either at +version is 0.5.4. The source repository is either at http://git.k1024.org/pyxattr.git or at https://github.com/iustin/pyxattr. @@ -24,7 +24,7 @@ installed in order to build and install the module. License ------- -pyxattr is Copyright 2002-2008, 2012, 2013, 2014 Iustin Pop. +pyxattr is Copyright 2002-2008, 2012-2015 Iustin Pop. pyxattr is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free diff --git a/doc/conf.py b/doc/conf.py index d0733cb..060ab2a 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -41,16 +41,16 @@ master_doc = 'index' # General information about the project. project = u'pyxattr' -copyright = u'2002, 2003, 2006, 2008, 2012, 2013, 2014, Iustin Pop' +copyright = u'2002, 2003, 2006, 2008, 2012, 2013, 2014, 2015, Iustin Pop' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = '0.5.3' +version = '0.5.4' # The full version, including alpha/beta/rc tags. -release = '0.5.3' +release = '0.5.4' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/pyxattr.egg-info/PKG-INFO b/pyxattr.egg-info/PKG-INFO index 66b8fda..58725ce 100644 --- a/pyxattr.egg-info/PKG-INFO +++ b/pyxattr.egg-info/PKG-INFO @@ -1,10 +1,10 @@ Metadata-Version: 1.1 Name: pyxattr -Version: 0.5.3 +Version: 0.5.4 Summary: Filesystem extended attributes for python Home-page: http://pyxattr.k1024.org/ Author: Iustin Pop -Author-email: iusty@k1024.org +Author-email: iustin@k1024.org License: LGPL Download-URL: http://pyxattr.k1024.org/downloads/ Description: This is a C extension module for Python which diff --git a/setup.py b/setup.py index 82c9747..e9bca09 100755 --- a/setup.py +++ b/setup.py @@ -9,9 +9,9 @@ except ImportError: long_desc = """This is a C extension module for Python which implements extended attributes manipulation. It is a wrapper on top of the attr C library - see attr(5).""" -version = "0.5.3" +version = "0.5.4" author = "Iustin Pop" -author_email = "iusty@k1024.org" +author_email = "iustin@k1024.org" macros = [ ("_XATTR_VERSION", '"%s"' % version), ("_XATTR_AUTHOR", '"%s"' % author), diff --git a/xattr.c b/xattr.c index cc1fa44..7c59090 100644 --- a/xattr.c +++ b/xattr.c @@ -1,7 +1,8 @@ /* xattr - a python module for manipulating filesystem extended attributes - Copyright (C) 2002, 2003, 2006, 2008, 2012, 2013 Iustin Pop + Copyright (C) 2002, 2003, 2006, 2008, 2012, 2013, 2015 + Iustin Pop This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -367,13 +368,13 @@ xattr_get(PyObject *self, PyObject *args, PyObject *keywds) if(merge_ns(ns, attrname, &fullname, &namebuf) < 0) { res = NULL; - goto freearg; + goto freetgt; } /* Find out the needed size of the buffer */ if((nalloc = _get_obj(&tgt, fullname, NULL, 0)) == -1) { res = PyErr_SetFromErrno(PyExc_IOError); - goto freetgt; + goto freenamebuf; } /* Try to allocate the memory, using Python's allocator */ -- 2.39.5