Check for getinfo errors before setting attributes

diff --git a/src/xattr.c b/src/xattr.c
index eb244f852941a3f55ef0a622f4af9f0342c031ed..e0350968050581869a4dff7be57c3d620ffb90f5 100644 (file)
--- a/src/xattr.c
+++ b/src/xattr.c
@@ -31,7 +31,7 @@
 #include <sys/xattr.h> /* include header from libc, not from libattr */
 
 /* mapping table of curl metadata to extended attribute names */
-static struct xattr_mapping {
+static const struct xattr_mapping {
   const char *attr; /* name of the xattr */
   CURLINFO info;
 } mappings[] = {
@@ -50,11 +50,11 @@ int write_xattr(CURL *curl, const char *filename)
 {
   int i = 0;
   int err = 0;
-  /* loop through all xattr-curlinfo pairs and abort on error */
+  /* loop through all xattr-curlinfo pairs and abort on a set error */
   while ( err == 0 && mappings[i].attr != NULL ) {
     char *value = NULL;
-    curl_easy_getinfo(curl, mappings[i].info, &value);
-    if (value) {
+    CURLcode rc = curl_easy_getinfo(curl, mappings[i].info, &value);
+    if ( rc == CURLE_OK && value ) {
       err = setxattr( filename, mappings[i].attr, value, strlen(value), 0 );
     }
     i++;