Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Quick port amf #5068

Merged
merged 14 commits into from
Mar 21, 2021
Merged

Quick port amf #5068

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
61b6cb1
Ports the basic deflate and related items from prusa3d/PrusaSlicer fo…
lordofhyphens Mar 20, 2021
4de4168
Actually add the tests to read files.
lordofhyphens Mar 20, 2021
d902645
Push all the utils into one header.
lordofhyphens Mar 20, 2021
3953c5c
Revise slightly to ensure we end up in the logic and just rely on str…
lordofhyphens Mar 21, 2021
3f84f1a
Use more compatible CMake construction?
lordofhyphens Mar 21, 2021
fa41d92
Build using cmake3 on travis.
lordofhyphens Mar 21, 2021
9b0eb65
Fix use of strcmp; remove unused config definition
lordofhyphens Mar 21, 2021
648bc73
throw an exception if bad zip file
lordofhyphens Mar 21, 2021
69e27ec
Use correct string header for cstrings; terminate buffer.
lordofhyphens Mar 21, 2021
bc1ec14
Insist on CMake >= 3.9, actually install it on Travis
lordofhyphens Mar 21, 2021
c9355d1
Use VERSION_STRING instead for boost
lordofhyphens Mar 21, 2021
1e58894
Use VERSION_GREATER_EQUAL to look for 1.74 or higher when attempting …
lordofhyphens Mar 21, 2021
a21ed47
invert logic to do what we want
lordofhyphens Mar 21, 2021
211438c
All build systems are terrible in their own way.
lordofhyphens Mar 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
throw an exception if bad zip file
  • Loading branch information
@lordofhyphens
lordofhyphens committed Mar 21, 2021
commit 648bc732af8bdcc8c35955470d7055618e973c04
5 changes: 4 additions & 1 deletion xs/src/libslic3r/miniz_extension.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include <exception>

#include "miniz_extension.hpp"
#include "Exception.hpp"

#if defined(_MSC_VER) || defined(__MINGW64__)
#include "boost/nowide/cstdio.hpp"
Expand Down Expand Up @@ -36,11 +37,13 @@ bool open_zip(mz_zip_archive *zip, const char *fname, bool isread)
if (isread)
{
res = mz_zip_reader_init_cfile(zip, f, 0, 0);
if (!res)
if (!res) {
// if we get here it means we tried to open a non-zip file
// we need to close the file here because the call to mz_zip_get_cfile() made into close_zip() returns a null pointer
// see: https://github.com/prusa3d/PrusaSlicer/issues/3536
fclose(f);
throw Slic3r::FileIOError("Tried to open a non-zip file.");
}
}
else
res = mz_zip_writer_init_cfile(zip, f, 0);
Expand Down