Fix validation

Constantine0808 · Aug 20, 2023 · ee760ce · ee760ce
1 parent f59edfa
commit ee760ce
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/examples/magnaluna b/examples/magnaluna
diff --git a/src/Magic.php b/src/Magic.php
@@ -398,9 +398,9 @@ public static function canConvertOgg(): bool {
             return self::$canConvert;
         }
         try {
-            Ogg::convert(new ReadableBuffer("\0"), new WritableBuffer);
+            Ogg::convert(new LocalFile(__DIR__.'/empty.wav'), new WritableBuffer);
             self::$canConvert = true;
-        } catch (\Throwable) {
+        } catch (\Throwable $e) {
             self::$canConvert = false;
         }
         return self::$canConvert;

diff --git a/src/Ogg.php b/src/Ogg.php
@@ -544,11 +544,14 @@ public static function validateOgg(LocalFile|RemoteUrl|ReadableStream $f): void
     {
         $ok = false;
         try {
-            $cancel = new DeferredCancellation;
-            $ogg = new self($f, $cancel->getCancellation());
-            $ok = \in_array('MADELINE_ENCODER_V=1', $ogg->comments, true);
-        } catch (\Throwable) {
-        }
+            try {
+                $cancel = new DeferredCancellation;
+                $ogg = new self($f, $cancel->getCancellation());
+                $ok = \in_array('MADELINE_ENCODER_V=1', $ogg->comments, true);
+            } finally {
+                $cancel->cancel();
+            }
+        } catch (\Throwable) {}
         if (!$ok) {
             throw new AssertionError("The passed file was not generated by MadelineProto or @libtgvoipbot, please pre-convert it using @libtgvoip bot or install FFI and ffmpeg to perform realtime conversion!");
         }

diff --git a/src/empty.wav b/src/empty.wav