Linking to ntdll on msvcrt is dangerous

ropensci · Sep 24, 2023 · f3ca19c · f3ca19c
1 parent 0932353
commit f3ca19c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -21,6 +21,7 @@ ifeq ($(R_COMPILED_BY),gcc 8.3.0)
 PCRE=-lpcre
 else
 PCRE=-lpcre2-8
+NTDLL=-lntdll
 endif
 
 PKG_LIBS = \
@@ -32,7 +33,7 @@ PKG_LIBS = \
 	-lcairo-gobject -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 ${PCRE} \
 	-lffi -lpng16 -ljpeg -ltiff -lintl -lz -liconv -lfribidi \
 	-lusp10 -liphlpapi -lgdiplus -lgdi32 -lole32 -ldnsapi -lws2_32 -luserenv\
-	-lrpcrt4 -lbcrypt -lmsimg32 -lshlwapi -luuid -lntdll \
+	-lrpcrt4 -lbcrypt -lmsimg32 -lshlwapi -luuid $(NTDLL) \
 
 #-ld2d1 -ldxguid
 
diff --git a/tools/winlibs.R b/tools/winlibs.R
@@ -7,7 +7,7 @@ if(!file.exists("../windows/librsvg/include/librsvg-2.0/librsvg/rsvg.h")){
   } else if(getRversion() >= "4.2") {
     "https://github.com/r-windows/bundles/releases/download/librsvg-2.50.9/librsvg-2.50.9-ucrt-x86_64.tar.xz"
   } else {
-    "https://github.com/rwinlib/rsvg/archive/refs/tags/2.50.5-2.tar.gz"
+    "https://github.com/rwinlib/rsvg/archive/v2.50.5.tar.gz"
   }
   download.file(url, basename(url), quiet = TRUE)
   dir.create("../windows", showWarnings = FALSE)