Merge pull request #1581 from rstudio/rchk-fixes

rchk fixes

Author: t-kalinowski

.Rbuildignore

@@ -37,3 +37,4 @@ __pycache__
 ^Dockerfile$
 ^\.dockerignore$
 ^\.git-blame-ignore-revs$
+^rchk$

.gitignore

@@ -14,4 +14,5 @@ issues/
 README.html
 index.html
 inst/doc
-.vscode/
+.vscode/
+rchk

NEWS.md

@@ -23,6 +23,8 @@
   to the original `sys.stdout` and `sys.stderr`, resulting in no further visible output
   from Python, and eventually, a segfault. (#1564)
 
+- Fixed issues reported by rchk, as requested by CRAN (#1581).
+
 - `py_to_r(x)` now returns `x` unmodified if `x` is not a Python object,
   instead of signaling an error.
 

src/libpython.cpp

@@ -290,6 +290,7 @@ bool LibPython::loadSymbols(bool python3, std::string* pError)
   // PyUnicode_AsEncodedString may have several different names depending on the Python
   // version and the UCS build type
   std::vector<std::string> names;
+  names.reserve(3);
   names.push_back("PyUnicode_AsEncodedString");
   names.push_back("PyUnicodeUCS2_AsEncodedString");
   names.push_back("PyUnicodeUCS4_AsEncodedString");