679612 - cppcheck indicates resource leak in APKOpen.cpp

Status: RESOLVED FIXED

(Core Graveyard :: Widget: Android, defect)

Description

[David Volgyes]

User Agent: Mozilla/5.0 (X11; Linux x86_64; rv:6.0) Gecko/20100101 Firefox/6.0
Build ID: 20110812233755

Steps to reproduce:

cppcheck found some error in other-licenses/android/APKOpen.cpp.



Actual results:

The warnings:
[other-licenses/android/APKOpen.cpp:293]: (error) Resource leak: fd
[other-licenses/android/APKOpen.cpp:512]: (error) Resource leak: fd

1st, 2nd: There are several exit point in APKOpen, where a file is open, and it is not closed at exit. 



Expected results:

You should close the file before the exit points.
Sometimes it is tricky, because the file is memory mapped, so first you have to unmap, and close the file after the unmap.

As far as I see this is upstream code, so maybe someone should propagate the error-report to the upstream code.

Comment 1

[Michael Wu [:mwu]]

APKOpen.cpp is all mozilla code.

Comment 2

[Josh Matthews [:jdm]]

If that's the case, then some enterprising person should be able to fix this up without much fuss. I think a class that closes the file handle in its destructor would be the best way to solve the problem. See http://mxr.mozilla.org/mozilla-central/source/toolkit/mozapps/readstrings/readstrings.cpp#60 for an example.

Comment 3

[Michael Wu [:mwu]]

(In reply to Josh Matthews [:jdm] from comment #2)
> If that's the case, then some enterprising person should be able to fix this
> up without much fuss. I think a class that closes the file handle in its
> destructor would be the best way to solve the problem. See
> http://mxr.mozilla.org/mozilla-central/source/toolkit/mozapps/readstrings/
> readstrings.cpp#60 for an example.

In the case of APKOpen.cpp, we aim to use as few C++ features as possible. IIRC it's c++ due to linking issues.

Comment 4

[Josh Matthews [:jdm]]

In that case ignore comment 2. Let's just add fclose calls to every exit point in the function.

Comment 5

[Atul Aggarwal]

Attachment: v1 patch for close(fd)

Comment 6

[Doug Turner (:dougt)]

mwu should review all changes to this file

Comment 7

[Michael Wu [:mwu]]

Comment on attachment 556394 [details] [diff] [review]
v1 patch for close(fd)

Heh.

Comment 8

[Ed Morley [:emorley]]

In my queue :-)

Comment 9

[Ed Morley [:emorley]]

Quick sanity check:
http://tbpl.allizom.org/?tree=Try&usebuildbot=1&rev=46750bfed1e1
...then onto inbound afterwards :-)

Comment 10

[Ed Morley [:emorley]]

http://hg.mozilla.org/integration/mozilla-inbound/rev/1cd727227440

Comment 11

[Ed Morley [:emorley]]

http://hg.mozilla.org/mozilla-central/rev/1cd727227440