Index: salesforce_api.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/salesforce/salesforce_api/salesforce_api.module,v
retrieving revision 1.2.2.21
diff -u -p -r1.2.2.21 salesforce_api.module
--- salesforce_api.module	31 Aug 2009 15:00:22 -0000	1.2.2.21
+++ salesforce_api.module	5 Nov 2009 20:24:00 -0000
@@ -576,12 +576,12 @@ function salesforce_api_fieldmap_export_
     // If a handler is specified for retrieving a value for the source field...
     if (isset($source_object['fields'][$value]['export'])) {
       // Get the value for the field from the handler function.
-      $object->$key = $source_object['fields'][$value]['export']($source, $value);
+      $object->$key = htmlentities($source_object['fields'][$value]['export']($source, $value));
     }
     elseif (isset($source->$value)) {
       // Otherwise set the field on the export object to the value of the source
       // field if it's present on the source object.
-      $object->$key = $source->$value;
+      $object->$key = htmlentities($source->$value);
     }
   }