From 172548b4cd24411c759316728346191bb3d94d68 Mon Sep 17 00:00:00 2001 From: Anton Todorov Date: Fri, 30 Jun 2017 23:18:40 +0300 Subject: [PATCH] xpath.rb fix crash when querying empty-element tag by returning empty string. Handling both `` and `` test pattern: ``` echo -e "\nb\n\ne\n"| /var/lib/one/remotes/datastore/xpath.rb /A/B /A/C /A/D /A/E | while IFS= read -r -d '' e; do echo "'$e'"; done ``` --- src/datastore_mad/remotes/xpath.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/datastore_mad/remotes/xpath.rb b/src/datastore_mad/remotes/xpath.rb index 2997825a89..4fa0ad96de 100755 --- a/src/datastore_mad/remotes/xpath.rb +++ b/src/datastore_mad/remotes/xpath.rb @@ -66,9 +66,9 @@ ARGV.each do |xpath| element = xml.elements[xpath.dup] if !element.nil? if element.class.method_defined?(:text) - values << element.text + values << ( element.text || '' ) else - values << element.to_s + values << ( element.to_s || '' ) end end end