Commit da1f2795 authored Nov 17, 2016 by Josh Gao

adb: fix progress percentage when pulling symlinks.

The adb protocol currently only supports lstat with no way of finding
the target of a symlink, so pulling a symlink that points to a file
looks like pulling a file with length equal to the length of path to
the symlink's target. Pulling a file that's sufficiently large can
overflow the int used to calculate percentage, and result in a bogus
completion percentage being displayed.

Bug: http://b/29277448
Test: adb pull /dev/block/platform/soc.0/f9824900.sdhci/by-name/system
Change-Id: I42d180550ac2aa9e4705676ccbb20f5db789fb8d

parent e631e470

adb/file_sync_client.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -149,7 +149,7 @@ struct TransferLedger {
		void ReportProgress(LinePrinter& lp, const std::string& file, uint64_t file_copied_bytes,
		uint64_t file_total_bytes) {
		char overall_percentage_str[5] = "?";
		if (bytes_expected != 0) {
		if (bytes_expected != 0 && bytes_transferred <= bytes_expected) {
		int overall_percentage = static_cast<int>(bytes_transferred * 100 / bytes_expected);
		// If we're pulling symbolic links, we'll pull the target of the link rather than
		// just create a local link, and that will cause us to go over 100%.