From ebcbf1913816471c2a3cc4c0dfde0c035859781e Mon Sep 17 00:00:00 2001
From: Nikita Kobzev <win.accuracy@gmail.com>
Date: Thu, 16 May 2024 13:53:48 +0300
Subject: [PATCH] Continue the sanitiazation enhancements

---
 pbom/io/bb/sanitizedstring.cpp | 2 +-
 pbom/io/jf/zerosizefilter.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pbom/io/bb/sanitizedstring.cpp b/pbom/io/bb/sanitizedstring.cpp
index dd43173..98871c2 100644
--- a/pbom/io/bb/sanitizedstring.cpp
+++ b/pbom/io/bb/sanitizedstring.cpp
@@ -51,7 +51,7 @@ namespace pboman3::io {
 
     bool SanitizedString::isCharLegal(const QChar& chr) {
         if (chr == '<' || chr == '>' || chr == ':' || chr == ':' || chr == '"' || chr == '\\' || chr == '/' ||
-            chr == '|' || chr == '?' || chr == '*') {
+            chr == '|' || chr == '?' || chr == '*' || chr == '{' || chr == '}') {
             return false;
         }
 
diff --git a/pbom/io/jf/zerosizefilter.cpp b/pbom/io/jf/zerosizefilter.cpp
index 3c8ca4d..2dfbd7c 100644
--- a/pbom/io/jf/zerosizefilter.cpp
+++ b/pbom/io/jf/zerosizefilter.cpp
@@ -2,6 +2,6 @@
 
 namespace pboman3::io {
     bool ZeroSizeFilter::isJunk(const PboNodeEntity* entry) const {
-        return entry->dataSize() <= 0;
+        return entry->dataSize() <= 0 || entry->packingMethod() == PboPackingMethod::Packed && entry->originalSize() <= 0;
     }
 }