ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

libpkgconf: pkg: use a second pointer for demunging windows paths

pull/199/head
Ariadne Conill 2020-05-26 13:41:39 -06:00
parent 92b09aef9a
commit c613eb5cce
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NEWS
View File

@ -1,6 +1,12 @@
Changes from previous version of pkgconf Changes from previous version of pkgconf
======================================== ========================================
Changes from 1.7.1 to 1.7.2:
----------------------------
* Bug fixes:
- Fix a windows-specific crash relating to path fixups.
Changes from 1.7.0 to 1.7.1: Changes from 1.7.0 to 1.7.1:
---------------------------- ----------------------------

5
libpkgconf/pkg.c
View File

@ -389,8 +389,9 @@ pkgconf_pkg_new_from_file(pkgconf_client_t *client, const char *filename, FILE *
* strrchr() took us to the last \ in that case, so we just have to see if * strrchr() took us to the last \ in that case, so we just have to see if
* it is followed by a /. If so, lop it off. * it is followed by a /. If so, lop it off.
*/ */
if ((idptr = strrchr(idptr, '/')) != NULL) char *mungeptr;
idptr++; if ((mungeptr = strrchr(idptr, '/')) != NULL)
idptr = mungeptr++;
#endif #endif
pkg->id = strdup(idptr); pkg->id = strdup(idptr);