681924 - HookSetWindowLongPtr is called several times

Status: RESOLVED FIXED

(Core Graveyard :: Plug-ins, defect)

Description

[Makoto Kato [:m_kato]]

When I had added multiple injenction support by bug 653361, plugin-container crashed.  Because HookSetWindowLongPtr is called several times.

HookSetWindowLongPtr should not inject after 2nd times.  (because return address is static!)

Comment 1

[Makoto Kato [:m_kato]]

Attachment: fix v1

Comment 2

[Makoto Kato [:m_kato]]

Attachment: fix v2

Comment 3

[Ben Turner (not reading bugmail, use the needinfo flag!)]

Comment on attachment 555996 [details] [diff] [review]
fix v2

I think you want jimmm to look over this.

Comment 4

[Jim Mathies [:jimm]]

Originally this was a passive error, no harm came from calling AddHook more than once. If we've changed this, I wonder if there is some way we can detect it in AddHook and assert?

Comment 5

[Kyle Huey (Exited; not receiving bugmail, old account, do not use)]

I went ahead and landed this as a bustage fix for Bug 684215.

http://hg.mozilla.org/mozilla-central/rev/0664108eb19d

Comment 6

[Makoto Kato [:m_kato]]

(In reply to Jim Mathies [:jimm] from comment #4)
> Originally this was a passive error, no harm came from calling AddHook more
> than once. If we've changed this, I wonder if there is some way we can
> detect it in AddHook and assert?

No assertion on current code.  But now, glandium has added TestDllIntercept test that can inject APIs.