From 2b87fa400a6a8a3677c09f9b0e690d97eff8d560 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 27 Jan 2023 15:49:48 +0530
Subject: [PATCH] Cleanup wchar_raii constructors

---
 src/calibre/utils/cpp_binding.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/calibre/utils/cpp_binding.h b/src/calibre/utils/cpp_binding.h
index bf5d4ebc44..5877640931 100644
--- a/src/calibre/utils/cpp_binding.h
+++ b/src/calibre/utils/cpp_binding.h
@@ -6,6 +6,7 @@
 
 #pragma once
 
+#include <exception>
 #define PY_SSIZE_T_CLEAN
 #define UNICODE
 #define _UNICODE
@@ -56,8 +57,9 @@ class wchar_raii : public generic_raii<wchar_t*, wchar_raii_free, static_cast<wc
     private:
         Py_ssize_t sz;
     public:
-        wchar_raii(PyObject *obj) {
-            from_unicode(obj);
+        wchar_raii(wchar_t *x=NULL) : generic_raii(x), sz(0) {}
+        wchar_raii(PyObject *obj) : generic_raii(), sz(0) {
+            if (!from_unicode(obj)) PyErr_Clear();
         }
         wchar_raii(wchar_t *obj, size_t sz) : generic_raii(obj), sz(sz) { }
         int from_unicode(PyObject *obj) {