[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: playground/base/strigi/src/streams
From:       "Michel Hermier" <michel.hermier () gmail ! com>
Date:       2006-10-26 16:44:57
Message-ID: 2e631f490610260944hf00922kaeace9b93278466a () mail ! gmail ! com
[Download RAW message or body]

The test code can be simplifier to:

ZipInputStream::checkHeader(const char* data, int32_t datasize) {
    static const char magic[] = {0x50, 0x4b, 0x03, 0x04};
    return datasize > 8 && memcmp(data, magic, 4) == 0;
 }

2006/10/26, Jos van den Oever <jos@vandenoever.info>:
> SVN commit 599311 by vandenoever:
>
> Check the header of streamed zip files as valid too, because we now support it in Strigi.
>
>  M  +1 -6      zipinputstream.cpp
>
>
> --- trunk/playground/base/strigi/src/streams/zipinputstream.cpp #599310:599311
> @@ -30,12 +30,7 @@
>  ZipInputStream::checkHeader(const char* data, int32_t datasize) {
>      static const char magic[] = {0x50, 0x4b, 0x03, 0x04};
>      if (datasize < 4) return false;
> -    bool ok = memcmp(data, magic, 4) == 0;
> -    if (ok && datasize >= 8) {
> -        int32_t generalBitFlags = read2bytes((const unsigned char*)data+6);
> -        // this type of zip is not easily readable as stream
> -        ok = !(generalBitFlags & 8);
> -    }
> +    bool ok = memcmp(data, magic, 4) == 0 && datasize > 8;
>      return ok;
>  }
>  ZipInputStream::ZipInputStream(StreamBase<char>* input)
>
[prev in list] [next in list] [prev in thread] [next in thread]