🐞 Update version of third_party/ijar

third_party/ijar/ijar.cc

-// Copyright 2001,2007 Alan Donovan. All rights reserved.
+// Copyright 2015 The Bazel Authors. All rights reserved.
 //
-// Author: Alan Donovan <adonovan@google.com>
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //    http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
@@ skipping 10 matching lines @@
 #include <memory>
 
 #include "third_party/ijar/zip.h"
 
 namespace devtools_ijar {
 
 bool verbose = false;
 
 // Reads a JVM class from classdata_in (of the specified length), and
 // writes out a simplified class to classdata_out, advancing the
-// pointer.
-void StripClass(u1 *&classdata_out, const u1 *classdata_in, size_t in_length);
+// pointer. Returns true if the class should be kept.
+bool StripClass(u1*& classdata_out, const u1* classdata_in, size_t in_length);
 
 const char* CLASS_EXTENSION = ".class";
 const size_t CLASS_EXTENSION_LENGTH = strlen(CLASS_EXTENSION);
 
 // ZipExtractorProcessor that select only .class file and use
 // StripClass to generate an interface class, storing as a new file
 // in the specified ZipBuilder.
 class JarStripperProcessor : public ZipExtractorProcessor {
  public:
   JarStripperProcessor() {}
@@ skipping 22 matching lines @@
     return strcmp(filename + offset, CLASS_EXTENSION) == 0;
   }
   return false;
 }
 
 void JarStripperProcessor::Process(const char* filename, const u4 attr,
                                    const u1* data, const size_t size) {
   if (verbose) {
     fprintf(stderr, "INFO: StripClass: %s\n", filename);
   }
-  u1 *q = builder->NewFile(filename, 0);
-  u1 *classdata_out = q;
-  StripClass(q, data, size);  // actually process it
-  size_t out_length = q - classdata_out;
+  u1* buf = reinterpret_cast<u1*>(malloc(size));
+  u1* classdata_out = buf;
+  if (!StripClass(buf, data, size)) {
+    free(classdata_out);
+    return;
+  }
+  u1* q = builder->NewFile(filename, 0);
+  size_t out_length = buf - classdata_out;
+  memcpy(q, classdata_out, out_length);
   builder->FinishFile(out_length);
+  free(classdata_out);
 }
 
 // Opens "file_in" (a .jar file) for reading, and writes an interface
 // .jar to "file_out".
 void OpenFilesAndProcessJar(const char *file_out, const char *file_in) {
   JarStripperProcessor processor;
   std::unique_ptr<ZipExtractor> in(ZipExtractor::Create(file_in, &processor));
   if (in.get() == NULL) {
     fprintf(stderr, "Unable to open Zip file %s: %s\n", file_in,
             strerror(errno));
@@ skipping 79 matching lines @@
     }
   }
 
   if (devtools_ijar::verbose) {
     fprintf(stderr, "INFO: writing to '%s'.\n", filename_out);
   }
 
   devtools_ijar::OpenFilesAndProcessJar(filename_out, filename_in);
   return 0;
 }