RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 11-Apr-2011 07:08:15 Branch: HEAD Handle: 2011041105081500 Modified files: rpm/lib rpmds.c Log: fix segfault in case 's == NULL', also use strrchr() rather than rindex() Summary: Revision Changes Path 2.179 +2 -3 rpm/lib/rpmds.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/lib/rpmds.c ============================================================================ $ cvs diff -u -r2.178 -r2.179 rpmds.c --- rpm/lib/rpmds.c 10 Apr 2011 22:53:04 -0000 2.178 +++ rpm/lib/rpmds.c 11 Apr 2011 05:08:15 -0000 2.179 @@ -3282,7 +3282,7 @@ /** \ingroup rpmds * Extract dependencies from a symlink. - * XXX Prototype added to keep GCC quite and avoid adding a symbol. + * XXX Prototype added to keep GCC quiet and avoid adding a symbol. * @param fn file name * @param flags 1: skip provides 2: skip requires * @param *add add(arg, ds) saves next provide/require symlink dependency. @@ -3330,8 +3330,7 @@ ARGV_t deps = NULL; /* Filename must end with ".so" to be devel(...) dependency. */ - s = rindex(fn, '.'); - if (strcmp(s, ".so")) + if ((s = strrchr(fn, '.')) && strcmp(s, ".so")) return 0; if ((lnklen = readlink(fn, path, MAXPATHLEN - 1)) == -1) { @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org