Merge commit 'bc5fa308da2e39fed26721eac7618a3104624bdc'

#Conflicts:
#	NEWS.md

NEWS.md

@@ -3,6 +3,8 @@
 * `xml_find_int()` analogous to `xml_find_num()` for returning integers 
   matched by an XPath (#365, @michaelchirico).
 
+* Fix format string issues detected in R-devel.
+
 * `xml_serialize()` now includes the document type so that `xml_unserialize()` works also for HTML documents (#407, @HenrikBengtsson).
 
 * Remove unused dependencies on glue, withr and lifecycle (@mgirlich).

src/xml2_init.cpp

@@ -34,7 +34,7 @@ void handleGenericError(void *ctx, const char *fmt, ...)
 
   va_start(arg, fmt);
   vsnprintf(buffer, BUFSIZ, fmt, arg);
-  Rf_error(buffer);
+  Rf_error("%s", buffer);
 }
 
 // [[export]]

src/xml2_output.cpp

@@ -92,7 +92,7 @@ int xml_write_callback(SEXP con, const char * buffer, int len) {
   size_t write_size;
 
   if ((write_size = R_WriteConnection(con, (void *) buffer, len)) != static_cast<size_t>(len)) {
-    Rf_error("write failed, expected %l, got %l", len, write_size);
+    Rf_error("write failed, expected %i, got %li", len, write_size);
   }
   return write_size;
 }