Commit 460db498 authored by Nathan Froyd's avatar Nathan Froyd
Browse files

Bug 1249389 - part 3 - assert the size of nsZipItemPtr's storage type; r=erahm 

The only uses of this class use a template argument with a size of
|char| (uint8_t and char), and the class isn't designed to accomodate
template arguments of larger size (e.g. the implementation of Forget()
neglects to divide by sizeof(T) for allocating a return buffer).  Let's
enforce this with a static_assert.  This change makes the class safer to
use and also makes future changes simpler to reason about.
parent f49b2c8d

modules/libjar/nsZipArchive.h

+4 −0
Original line number Diff line number Diff line
@@ -350,6 +350,10 @@ protected: 
template <class T>

class nsZipItemPtr final : public nsZipItemPtr_base

{

  static_assert(sizeof(T) == sizeof(char),

                "This class cannot be used with larger T without re-examining"

                " a number of assumptions.");



public:

  nsZipItemPtr(nsZipArchive *aZip, const char *aEntryName, bool doCRC = false) : nsZipItemPtr_base(aZip, aEntryName, doCRC) { }

  /**