Changeset 12344


Ignore:
Timestamp:
01/08/10 19:02:42 (11 years ago)
Author:
astalla
Message:

Fixed loading of compressed FASLs (.abcl) from jar files when the FASL is in a subdirectory.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/Load.java

    r12331 r12344  
    228228                // init FASL.
    229229                int i = zipEntryName.lastIndexOf('.');
    230                 String subZipEntryName = zipEntryName.substring(0, i).concat("._");
     230    int j = zipEntryName.lastIndexOf('/');
     231    if(j >= i) {
     232        return error(new LispError("Invalid zip entry name: " + zipEntryName));
     233    }
     234                String subZipEntryName = zipEntryName.substring(j + 1, i).concat("._");
    231235                in = Utilities.getZippedZipEntryAsInputStream(zipfile,
    232236                                                              zipEntryName,
Note: See TracChangeset for help on using the changeset viewer.