Attachment #72391 for bug #48675

View Details Raw Unified Return to Bug 48675



2010-10-29  Andreas Kling  <kling@webkit.org>

        Reviewed by NOBODY (OOPS!).

        [Qt] QtTestBrowser: Fix uninitialized read in FpsTimer
        https://bugs.webkit.org/show_bug.cgi?id=48675

        FpsTimer::m_timer was never initialized and passed to QObject::killTimer()
        on startup with in -graphicsbased mode.

        * QtTestBrowser/fpstimer.cpp:
        (FpsTimer::FpsTimer):
        (FpsTimer::numFrames):
        (FpsTimer::stop):
        (FpsTimer::timerEvent):
        * QtTestBrowser/fpstimer.h:

2010-10-29  Dimitri Glazkov  <dglazkov@chromium.org>

        Reviewed by Ojan Vafai.



#define FPS_MEASURE_INTERVAL 1000 / 60

FpsTimer::FpsTimer(QObject* parent)
    : QObject(parent)
    , m_timer(0)
{
}

int FpsTimer::numFrames(int spanMillis) const
{
    const QTime now = QTime::currentTime();



void FpsTimer::stop()
{
    if (!m_timer)
        return;
    killTimer(m_timer);
    m_frames.clear();
}

void FpsTimer::timerEvent(QTimerEvent* event)
{
    if (event->timerId() != m_timer)
        return;
    m_frames.append(QTime::currentTime());
    if (m_frames.length() > MAX_FRAMES_SAVED)

Lines 37-43 class FpsTimer : public QObject { a/WebKitTools/QtTestBrowser/fpstimer.h_sec1
- a/WebKitTools/QtTestBrowser/fpstimer.h -1 / +1 lines
37		37
38	public:	38	public:
39	FpsTimer(QObject* parent = 0);	39	FpsTimer(QObject* parent = 0);
40	int numFrames(int spanMillis = 1000);	40	int numFrames(int spanMillis = 1000) const;
41		41
42	public Q_SLOTS:	42	public Q_SLOTS:
43	void start();	43	void start();

Return to Bug 48675

Lines 1-3 a/WebKitTools/ChangeLog_sec1
- a/WebKitTools/ChangeLog +17 lines
		1	2010-10-29 Andreas Kling <kling@webkit.org>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	[Qt] QtTestBrowser: Fix uninitialized read in FpsTimer
		6	https://bugs.webkit.org/show_bug.cgi?id=48675
		7
		8	FpsTimer::m_timer was never initialized and passed to QObject::killTimer()
		9	on startup with in -graphicsbased mode.
		10
		11	* QtTestBrowser/fpstimer.cpp:
		12	(FpsTimer::FpsTimer):
		13	(FpsTimer::numFrames):
		14	(FpsTimer::stop):
		15	(FpsTimer::timerEvent):
		16	* QtTestBrowser/fpstimer.h:
		17
1	2010-10-29 Dimitri Glazkov <dglazkov@chromium.org>	18	2010-10-29 Dimitri Glazkov <dglazkov@chromium.org>
2		19
3	Reviewed by Ojan Vafai.	20	Reviewed by Ojan Vafai.

Lines 37-47 a/WebKitTools/QtTestBrowser/fpstimer.cpp_sec1
- a/WebKitTools/QtTestBrowser/fpstimer.cpp -3 / +6 lines
37	#define FPS_MEASURE_INTERVAL 1000 / 60	37	#define FPS_MEASURE_INTERVAL 1000 / 60
38		38
39	FpsTimer::FpsTimer(QObject* parent)	39	FpsTimer::FpsTimer(QObject* parent)
40	: QObject(parent)	40	: QObject(parent)
		41	, m_timer(0)
41	{	42	{
42	}	43	}
43		44
44	int FpsTimer::numFrames(int spanMillis)	45	int FpsTimer::numFrames(int spanMillis) const
45	{	46	{
46	const QTime now = QTime::currentTime();	47	const QTime now = QTime::currentTime();
47		48
Lines 63-75 void FpsTimer::start() a/WebKitTools/QtTestBrowser/fpstimer.cpp_sec2
63		64
64	void FpsTimer::stop()	65	void FpsTimer::stop()
65	{	66	{
		67	if (!m_timer)
		68	return;
66	killTimer(m_timer);	69	killTimer(m_timer);
67	m_frames.clear();	70	m_frames.clear();
68	}	71	}
69		72
70	void FpsTimer::timerEvent(QTimerEvent* event)	73	void FpsTimer::timerEvent(QTimerEvent* event)
71	{	74	{
72	if (event->timerId() != m_timer)	75	if (event->timerId() != m_timer)
73	return;	76	return;
74	m_frames.append(QTime::currentTime());	77	m_frames.append(QTime::currentTime());
75	if (m_frames.length() > MAX_FRAMES_SAVED)	78	if (m_frames.length() > MAX_FRAMES_SAVED)