646306 - file is not defined in DirInstallLocation__readDirectoryFromFile

Status: VERIFIED FIXED

(Toolkit :: Add-ons Manager, defect)

Description

[timeless]

Mozilla/5.0 (Windows NT 6.1; rv:2.2a1pre) Gecko/20110329 Firefox/4.2a1pre

Warning: WARN addons.xpi: Failed to add directory install location app-profile: ReferenceError: file is not defined
Source File: resource://gre/modules/XPIProvider.jsm
Line: 6882

902   _readDirectoryFromFile: function DirInstallLocation__readDirectoryFromFile(aFile) {
6903     let fis = Cc["@mozilla.org/network/file-input-stream;1"].
6904               createInstance(Ci.nsIFileInputStream);
6905     fis.init(aFile, -1, -1, false);
6906     let line = { value: "" };
6907     if (fis instanceof Ci.nsILineInputStream)
6908       fis.readLine(line);
6909     fis.close();
6910     if (line.value) {
6911       let linkedDirectory = Cc["@mozilla.org/file/local;1"].
6912                             createInstance(Ci.nsILocalFile);
6913 
6914       try {
6915         linkedDirectory.initWithPath(line.value);
6916       }
6917       catch (e) {
6918         linkedDirectory.setRelativeDescriptor(file.parent, line.value);

'aFile' is defined in this function, 'file' is not...

Comment 1

[Blair McBride [:Unfocused] (UNAVAILABLE)]

Attachment: Patch v1

Disclaimer: I have no clue when it comes to testing this.

Comment 2

[Dave Townsend [:mossop]]

test_filepointer.js would be a good guide, it looks like it'll be failing right now if the pointer file contains a relative path.

Comment 3

[Dave Townsend [:mossop]]

Comment on attachment 522901 [details] [diff] [review]
Patch v1

Looks good, would very much like to see a test for this case though

Comment 4

[timeless]

fwiw i hit this using unpacked omni.jar

Comment 5

[Dave Townsend [:mossop]]

Needs a test before landing

Comment 6

[Blair McBride [:Unfocused] (UNAVAILABLE)]

Attachment: Patch v1.1

Now with test.

Comment 7

[Dave Townsend [:mossop]]

Comment on attachment 536227 [details] [diff] [review]
Patch v1.1

Review of attachment 536227 [details] [diff] [review]:
-----------------------------------------------------------------

Awesome, thanks

Comment 8

[Blair McBride [:Unfocused] (UNAVAILABLE)]

http://hg.mozilla.org/mozilla-central/rev/c5e0aaaff9e1

Comment 9

[Henrik Skupin [:whimboo][⌚️UTC+1]]

Verified fixed by check-in and passing tests.