Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24d0c563 authored by Jingwen Chen's avatar Jingwen Chen
Browse files

Remove unnecessary pass in validatePath. 

Perform a single pass over pathComponents in both validatePath and
validateSafePath instead.

Test: presubmits
Change-Id: I1499183e345ca180900c54a18f9dc8bd534f2588
parent 1b1febdf

android/paths.go

+15 −9
Original line number Diff line number Diff line
@@ -1868,10 +1868,14 @@ func (p InstallPaths) Strings() []string { 
	return ret

}



// validateSafePath validates a path that we trust (may contain ninja variables).

// Ensures that each path component does not attempt to leave its component.

func validateSafePath(pathComponents ...string) (string, error) {

// validatePathInternal ensures that a path does not leave its component, and

// optionally doesn't contain Ninja variables.

func validatePathInternal(allowNinjaVariables bool, pathComponents ...string) (string, error) {

	for _, path := range pathComponents {

		if !allowNinjaVariables && strings.Contains(path, "$") {

			return "", fmt.Errorf("Path contains invalid character($): %s", path)

		}



		path := filepath.Clean(path)

		if path == ".." || strings.HasPrefix(path, "../") || strings.HasPrefix(path, "/") {

			return "", fmt.Errorf("Path is outside directory: %s", path)
@@ -1883,16 +1887,18 @@ func validateSafePath(pathComponents ...string) (string, error) { 
	return filepath.Join(pathComponents...), nil

}



// validateSafePath validates a path that we trust (may contain ninja

// variables).  Ensures that each path component does not attempt to leave its

// component. Returns a joined version of each path component.

func validateSafePath(pathComponents ...string) (string, error) {

	return validatePathInternal(true, pathComponents...)

}



// validatePath validates that a path does not include ninja variables, and that

// each path component does not attempt to leave its component. Returns a joined

// version of each path component.

func validatePath(pathComponents ...string) (string, error) {

	for _, path := range pathComponents {

		if strings.Contains(path, "$") {

			return "", fmt.Errorf("Path contains invalid character($): %s", path)

		}

	}

	return validateSafePath(pathComponents...)

	return validatePathInternal(false, pathComponents...)

}



func PathForPhony(ctx PathContext, phony string) WritablePath {