Merge "fix audioflinger integer multiplication overflow" into rvc-dev am:... (6990465b) · Commits · e / os / android_frameworks_av

services/audioflinger/FastThread.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -309,7 +309,7 @@ bool FastThread::threadLoop()
		// compute the delta value of clock_gettime(CLOCK_MONOTONIC)
		uint32_t monotonicNs = nsec;
		if (sec > 0 && sec < 4) {
		monotonicNs += sec * 1000000000;
		monotonicNs += sec * 1000000000U; // unsigned to prevent signed overflow.
		}
		// compute raw CPU load = delta value of clock_gettime(CLOCK_THREAD_CPUTIME_ID)
		uint32_t loadNs = 0;
		@@ -325,7 +325,7 @@ bool FastThread::threadLoop()
		}
		loadNs = nsec;
		if (sec > 0 && sec < 4) {
		loadNs += sec * 1000000000;
		loadNs += sec * 1000000000U; // unsigned to prevent signed overflow.
		}
		} else {
		// first time through the loop