unsigned char *properties=NULL;
long int fileLength=0;
-static char ole_sign[]={0xD0,0xCF,0x11,0xE0,0xA1,0xB1,0x1A,0xE1,0};
-
+char ole_sign[]={0xD0,0xCF,0x11,0xE0,0xA1,0xB1,0x1A,0xE1,0};
+char zip_sign[]="PK\003\004";
/**
* Initializes ole structure
if ( ret != BBD_BLOCK_SIZE ) {
return NULL;
}
- if (strncmp((char *)&oleBuf,ole_sign,8) != 0) {
+ if (strncmp((char *)&oleBuf,zip_sign,4) == 0) {
+ fprintf(stderr,"Looks like ZIP archive or Office 2007 or later. Not supported\n");
+ return NULL;
+ } else if (strncmp((char *)&oleBuf,ole_sign,8) != 0) {
return NULL;
}
sectorSize = 1<<getshort(oleBuf,0x1e);
return NULL;
}
while(1) {
+ if(chainCurrent < 0 ||
+ chainCurrent >= (
+ e->isBigBlock ?
+ ((bbdNumBlocks*sectorSize)/4) :
+ ((sbdNumber*shortSectorSize)/4)
+ ) ||
+ (e->numOfBlocks >
+ e->length/(
+ e->isBigBlock ?
+ sectorSize :
+ shortSectorSize
+ )
+ )
+ ) {
+/* fprintf(stderr, "chain End=%ld\n", chainCurrent); */
+ break;
+ }
/* fprintf(stderr, "chainCurrent=%ld\n", chainCurrent); */
e->blocks[e->numOfBlocks++] = chainCurrent;
if (e->numOfBlocks >= chainMaxLen) {
} else {
chainCurrent=-1;
}
- if(chainCurrent <= 0 ||
- chainCurrent >= ( e->isBigBlock ?
- ((bbdNumBlocks*sectorSize)/4)
- : ((sbdNumber*shortSectorSize)/4) ) ||
- (e->numOfBlocks >
- e->length/(e->isBigBlock ? sectorSize : shortSectorSize))) {
-/* fprintf(stderr, "chain End=%ld\n", chainCurrent); */
- break;
- }
}
}