mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-31 22:35:33 +00:00
Code Issues Releases Wiki Activity

util: Fix the ispathsub corner case

Browse Source 
ispathsub("/foo", "/") reports false. This is a corner case,
as 2nd argument is not expected to end with /. Fix this and
add comment about ispathsub() arguments assumptions.

Reported-by: Andrey Vagin <avagin@parallels.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov
2014-11-09 23:26:56 +04:00
parent 6bc8b637e5
commit 1cad9b1049
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/util.h
View File

@@ -197,10 +197,17 @@ int vaddr_to_pfn(unsigned long vaddr, u64 *pfn);
*/ */
static inline bool strstartswith2(const char *str, const char *sub, char *end) static inline bool strstartswith2(const char *str, const char *sub, char *end)
{ {
const char *osub = sub;
while (1) { while (1) {
if (*sub == '\0') /* end of sub -- match */ { if (*sub == '\0') /* end of sub -- match */ {
if (end) if (end) {
*end = *str; if (sub == osub + 1) /* pure root */
*end = '/';
else
*end = *str;
}
return true; return true;
} }
if (*str == '\0') /* end of str, sub is NOT ended -- miss */ if (*str == '\0') /* end of str, sub is NOT ended -- miss */
@@ -222,6 +229,11 @@ static inline bool strstartswith(const char *str, const char *sub)
* Checks whether the @path has @sub_path as a sub path, i.e. * Checks whether the @path has @sub_path as a sub path, i.e.
* sub_path is the beginning of path and the last component * sub_path is the beginning of path and the last component
* match is full (next character terminates path component). * match is full (next character terminates path component).
*
* Paths shouldn't contain excessive /-s, i.e. only one slash
* between path components and no slash at the end (except for
* the "/" path. This is pretty good assumption to what paths
* are used by criu.
*/ */
static inline bool issubpath(const char *path, const char *sub_path) static inline bool issubpath(const char *path, const char *sub_path)